Skip to content

Commit 1251ca2

Browse files
committed
debug
Signed-off-by: Saw-jan <[email protected]>
1 parent bb1560f commit 1251ca2

File tree

2 files changed

+125
-113
lines changed

2 files changed

+125
-113
lines changed

.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
name: REUSE Compliance Check
1111

12-
on: [pull_request]
12+
on: [push]
1313

1414
permissions:
1515
contents: read

.github/workflows/shared_workflow.yml

Lines changed: 124 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,72 @@ on:
1010
nextcloud_versions:
1111
required: false
1212
type: string
13-
default: "30 31 32 master"
13+
# default: "30 31 32 master"
14+
default: "32"
1415
php_versions:
1516
required: false
1617
type: string
17-
default: "8.1 8.2 8.3"
18+
# default: "8.1 8.2 8.3"
19+
default: "8.3"
1820

1921
name: CI
2022

2123
jobs:
22-
js-lint-unit:
23-
name: js lint and unit tests
24-
runs-on: ubuntu-22.04
25-
steps:
26-
- name: Checkout for nightly CI
27-
if: github.event_name == 'schedule'
28-
uses: actions/checkout@v3
29-
with:
30-
ref: ${{ inputs.branch }}
31-
32-
- name: Checkout
33-
if: github.event_name != 'schedule'
34-
uses: actions/checkout@v3
35-
36-
- name: Read package.json node and npm engines version
37-
uses: skjnldsv/read-package-engines-version-actions@v2
38-
id: versions
39-
with:
40-
fallbackNode: '^14'
41-
fallbackNpm: '^7'
42-
43-
- name: Setup NodeJS ${{ steps.versions.outputs.nodeVersion }}
44-
uses: actions/setup-node@v3
45-
with:
46-
node-version: ${{ steps.versions.outputs.nodeVersion }}
47-
cache: 'npm'
48-
49-
- name: Setup NPM ${{ steps.versions.outputs.npmVersion }}
50-
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
51-
52-
- name: Install NPM Dependencies
53-
run: npm install
54-
55-
- name: JS Lint
56-
run: make lint-js || ( echo 'Please run `make lint-js-fix` to format your code' && exit 1 )
57-
58-
- name: Vue Unit tests
59-
run: |
60-
make jsunit
61-
62-
- name: JS Code Coverage Summary Report
63-
if: ${{ github.event_name == 'pull_request' }}
64-
uses: romeovs/[email protected]
65-
with:
66-
github-token: ${{ secrets.GITHUB_TOKEN }}
67-
lcov-file: ./coverage/jest/lcov.info
68-
delete-old-comments: true
69-
title: "JS Code Coverage"
70-
71-
- name: JS coverage check
72-
if: ${{ github.event_name == 'pull_request' }}
73-
uses: VeryGoodOpenSource/very_good_coverage@v2
74-
with:
75-
min_coverage: '59'
76-
path: './coverage/jest/lcov.info'
24+
# js-lint-unit:
25+
# name: js lint and unit tests
26+
# runs-on: ubuntu-22.04
27+
# steps:
28+
# - name: Checkout for nightly CI
29+
# if: github.event_name == 'schedule'
30+
# uses: actions/checkout@v3
31+
# with:
32+
# ref: ${{ inputs.branch }}
33+
34+
# - name: Checkout
35+
# if: github.event_name != 'schedule'
36+
# uses: actions/checkout@v3
37+
38+
# - name: Read package.json node and npm engines version
39+
# uses: skjnldsv/read-package-engines-version-actions@v2
40+
# id: versions
41+
# with:
42+
# fallbackNode: '^14'
43+
# fallbackNpm: '^7'
44+
45+
# - name: Setup NodeJS ${{ steps.versions.outputs.nodeVersion }}
46+
# uses: actions/setup-node@v3
47+
# with:
48+
# node-version: ${{ steps.versions.outputs.nodeVersion }}
49+
# cache: 'npm'
50+
51+
# - name: Setup NPM ${{ steps.versions.outputs.npmVersion }}
52+
# run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
53+
54+
# - name: Install NPM Dependencies
55+
# run: npm install
56+
57+
# - name: JS Lint
58+
# run: make lint-js || ( echo 'Please run `make lint-js-fix` to format your code' && exit 1 )
59+
60+
# - name: Vue Unit tests
61+
# run: |
62+
# make jsunit
63+
64+
# - name: JS Code Coverage Summary Report
65+
# if: ${{ github.event_name == 'pull_request' }}
66+
# uses: romeovs/[email protected]
67+
# with:
68+
# github-token: ${{ secrets.GITHUB_TOKEN }}
69+
# lcov-file: ./coverage/jest/lcov.info
70+
# delete-old-comments: true
71+
# title: "JS Code Coverage"
72+
73+
# - name: JS coverage check
74+
# if: ${{ github.event_name == 'pull_request' }}
75+
# uses: VeryGoodOpenSource/very_good_coverage@v2
76+
# with:
77+
# min_coverage: '59'
78+
# path: './coverage/jest/lcov.info'
7779

7880
create-matrix:
7981
runs-on: ubuntu-22.04
@@ -95,7 +97,7 @@ jobs:
9597
PHP_VERSIONS: ${{ inputs.php_versions }}
9698
DEFAULT_PHP_VERSION: "8.2"
9799
DEFAULT_DATABASE: "mysql"
98-
EXTRA_DATABASES: "pgsql"
100+
# EXTRA_DATABASES: "pgsql"
99101
run: |
100102
MATRIX=$(./.github/scripts/generate-matrix.sh)
101103
echo "matrix={\"include\": [$MATRIX]}" >> $GITHUB_OUTPUT
@@ -109,6 +111,8 @@ jobs:
109111
strategy:
110112
matrix: ${{ fromJson(needs.create-matrix.outputs.matrix) }}
111113
runs-on: ubuntu-22.04
114+
env:
115+
SERVER_PATH: ${{ github.workspace }}/../server
112116

113117
defaults:
114118
run:
@@ -121,7 +125,7 @@ jobs:
121125
SQL: ${{ matrix.database }}
122126
SERVER_BRANCH: ${{ matrix.nextcloudVersion }}
123127
NEXTCLOUD_AUTOINSTALL: "Yes"
124-
NEXTCLOUD_AUTOINSTALL_APPS: "viewer activity groupfolders integration_openproject"
128+
NEXTCLOUD_AUTOINSTALL_APPS: "user_oidc oidc activity groupfolders integration_openproject"
125129
NEXTCLOUD_TRUSTED_DOMAINS: nextcloud
126130
VIRTUAL_HOST: "nextcloud"
127131
WITH_REDIS: "YES"
@@ -130,6 +134,7 @@ jobs:
130134
- 80:80
131135
options: --name=nextcloud
132136
volumes:
137+
- ${{ github.workspace }}/../server:/var/www/html
133138
- ${{ github.workspace }}:/var/www/html/apps-shared
134139

135140
database-postgres:
@@ -151,56 +156,63 @@ jobs:
151156
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
152157

153158
steps:
154-
- name: Checkout for nightly CI
155-
if: github.event_name == 'schedule'
156-
uses: actions/checkout@v3
157-
with:
158-
path: integration_openproject
159-
ref: ${{ inputs.branch }}
160-
161159
- name: Checkout
162-
if: github.event_name != 'schedule'
163160
uses: actions/checkout@v3
164161
with:
165162
path: integration_openproject
163+
ref: ${{ inputs.branch }}
166164

167-
- name: Checkout activity app
168-
uses: actions/checkout@v3
169-
with:
170-
repository: nextcloud/activity
171-
path: activity
172-
ref: ${{ matrix.nextcloudVersion }}
173-
174-
- name: Checkout groupfolders app
175-
uses: actions/checkout@v3
176-
with:
177-
repository: nextcloud/groupfolders
178-
path: groupfolders
179-
ref: ${{ matrix.nextcloudVersion }}
180-
181-
- name: Checkout user_oidc app
182-
uses: actions/checkout@v3
183-
with:
184-
repository: nextcloud/user_oidc
185-
ref: v8.2.2
186-
fetch-tags: true
187-
path: user_oidc
188-
189-
- name: Checkout oidc app
190-
uses: actions/checkout@v3
191-
with:
192-
repository: h2CK/oidc
193-
ref: 1.14.5
194-
fetch-tags: true
195-
path: oidc
196-
197-
- name: Checkout server (for phpunit and psalm)
198-
uses: actions/checkout@v3
199-
with:
200-
submodules: true
201-
repository: nextcloud/server
202-
path: integration_openproject/server
203-
ref: ${{ matrix.nextcloudVersion }}
165+
- name: test
166+
run: |
167+
sleep 10
168+
echo $SERVER_PATH
169+
ls $SERVER_PATH
170+
ls $SERVER_PATH/apps-shared
171+
ls $SERVER_PATH/apps-shared/integration_openproject
172+
173+
# - name: Checkout
174+
# if: github.event_name != 'schedule'
175+
# uses: actions/checkout@v3
176+
# with:
177+
# path: integration_openproject
178+
179+
# - name: Checkout activity app
180+
# uses: actions/checkout@v3
181+
# with:
182+
# repository: nextcloud/activity
183+
# path: activity
184+
# ref: ${{ matrix.nextcloudVersion }}
185+
186+
# - name: Checkout groupfolders app
187+
# uses: actions/checkout@v3
188+
# with:
189+
# repository: nextcloud/groupfolders
190+
# path: groupfolders
191+
# ref: ${{ matrix.nextcloudVersion }}
192+
193+
# - name: Checkout user_oidc app
194+
# uses: actions/checkout@v3
195+
# with:
196+
# repository: nextcloud/user_oidc
197+
# ref: v8.2.2
198+
# fetch-tags: true
199+
# path: user_oidc
200+
201+
# - name: Checkout oidc app
202+
# uses: actions/checkout@v3
203+
# with:
204+
# repository: h2CK/oidc
205+
# ref: 1.14.5
206+
# fetch-tags: true
207+
# path: oidc
208+
209+
# - name: Checkout server (for phpunit and psalm)
210+
# uses: actions/checkout@v3
211+
# with:
212+
# submodules: true
213+
# repository: nextcloud/server
214+
# path: integration_openproject/server
215+
# ref: ${{ matrix.nextcloudVersion }}
204216

205217
- name: Setup PHP ${{ format('{0}.{1}', matrix.phpVersionMajor,matrix.phpVersionMinor) }}
206218
uses: shivammathur/setup-php@v2
@@ -221,13 +233,13 @@ jobs:
221233
key: ${{ runner.os }}-composer-${{ hashFiles('./composer.lock') }}
222234
restore-keys: ${{ runner.os }}-composer-
223235

224-
- name: Setup server and apps
225-
run: |
226-
# integration_openproject app
227-
composer install --no-progress --prefer-dist --optimize-autoloader
228-
# user_oidc app
229-
composer install --no-interaction --prefer-dist --optimize-autoloader --working-dir=../user_oidc
230-
cd server && ./occ maintenance:install --admin-pass=admin
236+
# - name: Setup server and apps
237+
# run: |
238+
# # integration_openproject app
239+
# composer install --no-progress --prefer-dist --optimize-autoloader
240+
# # user_oidc app
241+
# composer install --no-interaction --prefer-dist --optimize-autoloader --working-dir=../user_oidc
242+
# cd server && ./occ maintenance:install --admin-pass=admin
231243

232244
- name: PHP code analysis and linting
233245
run: |
@@ -318,7 +330,7 @@ jobs:
318330
319331
notify-nightly-report:
320332
needs:
321-
- js-lint-unit
333+
# - js-lint-unit
322334
- api-phpunit-tests
323335
if: ${{ always() && github.event_name == 'schedule' }}
324336
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)