Skip to content
This repository was archived by the owner on Aug 6, 2024. It is now read-only.

Commit 6a07055

Browse files
cmeessencmeessen
authored
Merge pull request #104 from hifis-net/update_v1.15.0
Update v1.15.0
2 parents 8595111 + d4cf572 commit 6a07055

File tree

520 files changed

+32828
-3851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+32828
-3851
lines changed

‎.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RSD_AUTH_URL=http://auth:7000
6161
# Allowed values are: SURFCONEXT, HELMHOLTZAAI, ORCID or LOCAL
6262
# if env value is not provided default provider is set to be SURFCONEXT
6363
# if you add the value "LOCAL", then local accounts are enabled, USE THIS FOR TESTING PURPOSES ONLY
64-
RSD_AUTH_PROVIDERS=SURFCONEXT;HELMHOLTZAAI
64+
RSD_AUTH_PROVIDERS=SURFCONEXT;ORCID;LOCAL
6565

6666
# Define a semicolon-separated list of user email addresses (exact match incl. the letter casing) of RSD admins.
6767
# When someome authenticates with an email address in this list,

‎.github/workflows/_cff.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
jobs:
2525
commit_cff:
2626
name: commit cff
27-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-22.04
2828
steps:
2929
- name: checkout ${{inputs.branch}}
3030
# https://github.com/actions/checkout

‎.github/workflows/_ghcr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ on:
4545
jobs:
4646
build_and_push:
4747
name: build and push image
48-
runs-on: ubuntu-latest
48+
runs-on: ubuntu-22.04
4949
outputs:
5050
image_build: ${{steps.build_image.outputs.image_build}}
5151
image_pushed: ${{steps.build_image.outputs.image_pushed}}

.github/workflows/tests_main.yml renamed to .github/workflows/all_tests.yml

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,11 @@
88
name: all tests
99

1010
on:
11-
push:
12-
branches:
13-
- main
14-
paths:
15-
- "frontend/**"
16-
- "database/**"
17-
- "backend-postgrest/**"
18-
- "scrapers/**"
11+
workflow_dispatch:
1912

2013
jobs:
2114
fe-tests:
22-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-22.04
2316
steps:
2417
- uses: actions/checkout@v3
2518
- name: "install node v18.5 and cash yarn"
@@ -39,7 +32,7 @@ jobs:
3932
run: yarn build
4033

4134
api-tests:
42-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-22.04
4336
steps:
4437
- uses: actions/checkout@v3
4538
- name: "newman tests with docker-compose"
@@ -50,10 +43,44 @@ jobs:
5043
--exit-code-from postgrest-tests
5144
5245
scrapers-tests:
53-
runs-on: ubuntu-latest
46+
runs-on: ubuntu-22.04
5447
steps:
5548
- uses: actions/checkout@v3
5649
- name: "Maven JUnit tests"
5750
working-directory: scrapers
5851
run: |
5952
JAVA_HOME=$JAVA_HOME_17_X64 mvn test
53+
54+
e2e-tests:
55+
timeout-minutes: 60
56+
runs-on: ubuntu-22.04
57+
steps:
58+
- uses: actions/checkout@v3
59+
- uses: actions/setup-node@v3
60+
with:
61+
node-version: 18.5
62+
cache: 'npm'
63+
cache-dependency-path: e2e/package-lock.json
64+
- name: install dependencies
65+
working-directory: e2e
66+
run: npm ci
67+
- name: install browsers
68+
working-directory: e2e
69+
run: npx playwright install --with-deps
70+
- name: build rsd
71+
run: |
72+
cp e2e/.env.e2e .env
73+
docker-compose build --parallel database backend auth frontend nginx swagger
74+
- name: start rsd
75+
run: |
76+
docker-compose up --detach database backend auth frontend nginx swagger
77+
sleep 10
78+
- name: run e2e tests
79+
working-directory: e2e
80+
run: npm run e2e:all
81+
- uses: actions/upload-artifact@v3
82+
if: always()
83+
with:
84+
name: playwright-report
85+
path: e2e/playwright-report/
86+
retention-days: 30

.github/workflows/pr_backend.yml renamed to .github/workflows/backend_tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,23 @@
55
#
66
# SPDX-License-Identifier: Apache-2.0
77

8-
name: backend api tests
8+
name: backend tests
99

1010
on:
11-
pull_request:
11+
push:
12+
branches:
13+
- main
1214
paths:
15+
- "backend-postgrest/**"
1316
- "database/**"
17+
pull_request:
18+
paths:
1419
- "backend-postgrest/**"
20+
- "database/**"
1521

1622
jobs:
1723
api-tests:
18-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04
1925
steps:
2026
- uses: actions/checkout@v3
2127
- name: "newman tests with docker-compose"

‎.github/workflows/cff_validate.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
validate:
1818
name: "validate cff"
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
steps:
2121
- name: Check out a copy of the repository
2222
uses: actions/checkout@v3

‎.github/workflows/documentation-deploy.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
12
# SPDX-FileCopyrightText: 2022 Jesús García Gonzalez (Netherlands eScience Center) <[email protected]>
23
# SPDX-FileCopyrightText: 2022 Netherlands eScience Center
4+
# SPDX-FileCopyrightText: 2022 dv4all
35
#
46
# SPDX-License-Identifier: Apache-2.0
57

@@ -8,15 +10,15 @@ name: documentation deploy
810
on:
911
# trigger deployment on every push to main branch
1012
push:
11-
branches:
13+
branches:
1214
- main
1315
paths:
1416
- "documentation/**"
1517
workflow_dispatch:
1618

1719
jobs:
1820
docs:
19-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-22.04
2022

2123
steps:
2224
- uses: actions/checkout@v2
@@ -45,13 +47,13 @@ jobs:
4547
- name: Install dependencies
4648
if: steps.yarn-cache.outputs.cache-hit != 'true'
4749
working-directory: documentation
48-
run:
50+
run:
4951
yarn --frozen-lockfile
5052

5153
# run build script
5254
- name: Build VuePress site
5355
working-directory: documentation
54-
run:
56+
run:
5557
yarn docs:build
5658

5759
# please check out the docs of the workflow for more details

‎.github/workflows/e2e_tests_macos.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
2+
# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) (dv4all)
3+
# SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
4+
# SPDX-FileCopyrightText: 2022 Netherlands eScience Center
5+
# SPDX-FileCopyrightText: 2022 dv4all
6+
#
7+
# SPDX-License-Identifier: Apache-2.0
8+
9+
name: e2e tests macos
10+
on:
11+
workflow_dispatch:
12+
inputs:
13+
browser:
14+
type: choice
15+
description: Select browser
16+
options:
17+
- chrome
18+
- msedge
19+
- firefox
20+
- webkit
21+
jobs:
22+
macos-v12:
23+
timeout-minutes: 30
24+
name: ${{inputs.browser}} macos v12
25+
runs-on: macos-12
26+
steps:
27+
- uses: actions/checkout@v3
28+
- name: install dependencies
29+
working-directory: e2e
30+
run: npm ci
31+
- name: install browsers
32+
working-directory: e2e
33+
run: npx playwright install chromium ${{inputs.browser}} --with-deps
34+
- name: run e2e tests
35+
working-directory: e2e
36+
run: npm run e2e:${{inputs.browser}}:dev
37+
- uses: actions/upload-artifact@v3
38+
if: always()
39+
with:
40+
name: macos-playwright-report-${{inputs.browser}}
41+
path: e2e/playwright-report/
42+
retention-days: 30
43+
- uses: actions/upload-artifact@v3
44+
if: failure()
45+
with:
46+
name: macos browser ${{inputs.browser}} state
47+
path: |
48+
e2e/state/
49+
retention-days: 30

‎.github/workflows/e2e_tests_ubuntu.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
2+
# SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) (dv4all)
3+
# SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
4+
# SPDX-FileCopyrightText: 2022 Netherlands eScience Center
5+
# SPDX-FileCopyrightText: 2022 dv4all
6+
#
7+
# SPDX-License-Identifier: Apache-2.0
8+
9+
name: e2e tests ubuntu
10+
on:
11+
workflow_dispatch:
12+
push:
13+
branches:
14+
- main
15+
paths:
16+
- "authentication/**"
17+
- "backend-postgrest/**"
18+
- "database/**"
19+
- "e2e/**"
20+
- "frontend/**"
21+
- "nginx/**"
22+
pull_request:
23+
paths:
24+
- "authentication/**"
25+
- "backend-postgrest/**"
26+
- "database/**"
27+
- "e2e/**"
28+
- "frontend/**"
29+
- "nginx/**"
30+
31+
jobs:
32+
ubuntu-v22:
33+
timeout-minutes: 30
34+
runs-on: ubuntu-22.04
35+
steps:
36+
- uses: actions/checkout@v3
37+
- uses: actions/setup-node@v3
38+
with:
39+
node-version: 18.5
40+
cache: 'npm'
41+
cache-dependency-path: e2e/package-lock.json
42+
- name: install dependencies
43+
working-directory: e2e
44+
run: npm ci
45+
- name: install browsers
46+
working-directory: e2e
47+
run: npx playwright install chromium chrome firefox --with-deps
48+
- name: build rsd
49+
working-directory: .
50+
run: |
51+
cp e2e/.env.e2e .env
52+
docker-compose build --parallel database backend auth frontend nginx swagger
53+
- name: start rsd
54+
working-directory: .
55+
run: |
56+
docker-compose up --detach database backend auth frontend nginx swagger
57+
sleep 10
58+
- name: run e2e tests
59+
working-directory: e2e
60+
run: npm run e2e:ubuntu
61+
- uses: actions/upload-artifact@v3
62+
if: always()
63+
with:
64+
name: playwright-report
65+
path: e2e/playwright-report/
66+
retention-days: 30
67+
- uses: actions/upload-artifact@v3
68+
if: failure()
69+
with:
70+
name: browser state and .env file
71+
path: |
72+
e2e/state/
73+
.env
74+
retention-days: 30
75+

‎.github/workflows/fair_software.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
fair-software:
2121
name: "fair-software"
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-22.04
2323
steps:
2424
# https://github.com/fair-software/howfairis-github-action
2525
- name: Measure compliance with fair-software.eu recommendations

0 commit comments

Comments
 (0)