Skip to content

Commit b7b1c3e

Browse files
author
Kuno Vercammen
committed
Merge remote-tracking branch 'origin/dspace-7_x' into process-ui-null-eperson-fix-7.6
# Conflicts: # src/assets/i18n/en.json5
2 parents 488958c + 0be17bb commit b7b1c3e

667 files changed

Lines changed: 28677 additions & 11520 deletions

File tree

Some content is hidden

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

.github/disabled-workflows/pull_request_opened.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
#CHROME_VERSION: "90.0.4430.212-1"
3434
# Bump Node heap size (OOM in CI after upgrading to Angular 15)
3535
NODE_OPTIONS: '--max-old-space-size=4096'
36+
# Project name to use when running docker-compose prior to e2e tests
37+
COMPOSE_PROJECT_NAME: 'ci'
3638
strategy:
3739
# Create a matrix of Node versions to test against (in parallel)
3840
matrix:
@@ -43,11 +45,11 @@ jobs:
4345
steps:
4446
# https://github.com/actions/checkout
4547
- name: Checkout codebase
46-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4749

4850
# https://github.com/actions/setup-node
4951
- name: Install Node.js ${{ matrix.node-version }}
50-
uses: actions/setup-node@v3
52+
uses: actions/setup-node@v4
5153
with:
5254
node-version: ${{ matrix.node-version }}
5355

@@ -72,7 +74,7 @@ jobs:
7274
id: yarn-cache-dir-path
7375
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
7476
- name: Cache Yarn dependencies
75-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7678
with:
7779
# Cache entire Yarn cache directory (see previous step)
7880
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -99,10 +101,10 @@ jobs:
99101
# so that it can be shared with the 'codecov' job (see below)
100102
# NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
101103
- name: Upload code coverage report to Artifact
102-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v4
103105
if: matrix.node-version == '18.x'
104106
with:
105-
name: dspace-angular coverage report
107+
name: coverage-report-${{ matrix.node-version }}
106108
path: 'coverage/dspace-angular/lcov.info'
107109
retention-days: 14
108110

@@ -118,7 +120,7 @@ jobs:
118120
# https://github.com/cypress-io/github-action
119121
# (NOTE: to run these e2e tests locally, just use 'ng e2e')
120122
- name: Run e2e tests (integration tests)
121-
uses: cypress-io/github-action@v5
123+
uses: cypress-io/github-action@v6
122124
with:
123125
# Run tests in Chrome, headless mode (default)
124126
browser: chrome
@@ -133,19 +135,19 @@ jobs:
133135
# Cypress always creates a video of all e2e tests (whether they succeeded or failed)
134136
# Save those in an Artifact
135137
- name: Upload e2e test videos to Artifacts
136-
uses: actions/upload-artifact@v3
138+
uses: actions/upload-artifact@v4
137139
if: always()
138140
with:
139-
name: e2e-test-videos
141+
name: e2e-test-videos-${{ matrix.node-version }}
140142
path: cypress/videos
141143

142144
# If e2e tests fail, Cypress creates a screenshot of what happened
143145
# Save those in an Artifact
144146
- name: Upload e2e test failure screenshots to Artifacts
145-
uses: actions/upload-artifact@v3
147+
uses: actions/upload-artifact@v4
146148
if: failure()
147149
with:
148-
name: e2e-test-screenshots
150+
name: e2e-test-screenshots-${{ matrix.node-version }}
149151
path: cypress/screenshots
150152

151153
- name: Stop app (in case it stays up after e2e tests)
@@ -191,22 +193,27 @@ jobs:
191193
runs-on: ubuntu-latest
192194
steps:
193195
- name: Checkout
194-
uses: actions/checkout@v3
196+
uses: actions/checkout@v4
195197

196198
# Download artifacts from previous 'tests' job
197199
- name: Download coverage artifacts
198-
uses: actions/download-artifact@v3
200+
uses: actions/download-artifact@v4
199201

200202
# Now attempt upload to Codecov using its action.
201203
# NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
202204
#
203205
# Retry action: https://github.com/marketplace/actions/retry-action
204206
# Codecov action: https://github.com/codecov/codecov-action
205207
- name: Upload coverage to Codecov.io
206-
uses: Wandalen/wretry.action@v1.0.36
208+
uses: Wandalen/wretry.action@v1.3.0
207209
with:
208-
action: codecov/codecov-action@v3
209-
# Try upload 5 times max
210+
action: codecov/codecov-action@v4
211+
# Ensure codecov-action throws an error when it fails to upload
212+
# This allows us to auto-restart the action if an error is thrown
213+
with: |
214+
fail_ci_if_error: true
215+
token: ${{ secrets.CODECOV_TOKEN }}
216+
# Try re-running action 5 times max
210217
attempt_limit: 5
211218
# Run again in 30 seconds
212219
attempt_delay: 30000

.github/workflows/codescan.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
# because CodeQL requires a fresh build with all tests *disabled*.
66
name: "Code Scanning"
77

8-
# Run this code scan for all pushes / PRs to main branch. Also run once a week.
8+
# Run this code scan for all pushes / PRs to main or maintenance branches. Also run once a week.
99
on:
1010
push:
11-
branches: [ main ]
11+
branches:
12+
- main
13+
- 'dspace-**'
1214
pull_request:
13-
branches: [ main ]
15+
branches:
16+
- main
17+
- 'dspace-**'
1418
# Don't run if PR is only updating static documentation
1519
paths-ignore:
1620
- '**/*.md'
@@ -31,7 +35,7 @@ jobs:
3135
steps:
3236
# https://github.com/actions/checkout
3337
- name: Checkout repository
34-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3539

3640
# Initializes the CodeQL tools for scanning.
3741
# https://github.com/github/codeql-action

.github/workflows/docker.yml

Lines changed: 39 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Docker images
33

44
# Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
55
# Also run for PRs to ensure PR doesn't break Docker build process
6+
# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
7+
# https://github.com/DSpace/DSpace/blob/dspace-7_x/.github/workflows/reusable-docker-build.yml
8+
#
69
on:
710
push:
811
branches:
@@ -16,105 +19,41 @@ permissions:
1619
contents: read # to fetch code (actions/checkout)
1720

1821
jobs:
19-
docker:
22+
#############################################################
23+
# Build/Push the 'dspace/dspace-angular' image
24+
#############################################################
25+
dspace-angular:
2026
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
2127
if: github.repository == 'dspace/dspace-angular'
22-
runs-on: ubuntu-latest
23-
env:
24-
# Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
25-
# For a new commit on default branch (main), use the literal tag 'dspace-7_x' on Docker image.
26-
# For a new commit on other branches, use the branch name as the tag for Docker image.
27-
# For a new tag, copy that tag name as the tag for Docker image.
28-
IMAGE_TAGS: |
29-
type=raw,value=dspace-7_x,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
30-
type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
31-
type=ref,event=tag
32-
# Define default tag "flavor" for docker/metadata-action per
33-
# https://github.com/docker/metadata-action#flavor-input
34-
# We turn off 'latest' tag by default.
35-
TAGS_FLAVOR: |
36-
latest=false
37-
# Architectures / Platforms for which we will build Docker images
38-
# If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
39-
# If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
40-
PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
41-
42-
steps:
43-
# https://github.com/actions/checkout
44-
- name: Checkout codebase
45-
uses: actions/checkout@v3
46-
47-
# https://github.com/docker/setup-buildx-action
48-
- name: Setup Docker Buildx
49-
uses: docker/setup-buildx-action@v2
50-
51-
# https://github.com/docker/setup-qemu-action
52-
- name: Set up QEMU emulation to build for multiple architectures
53-
uses: docker/setup-qemu-action@v2
54-
55-
# https://github.com/docker/login-action
56-
- name: Login to DockerHub
57-
# Only login if not a PR, as PRs only trigger a Docker build and not a push
58-
if: github.event_name != 'pull_request'
59-
uses: docker/login-action@v2
60-
with:
61-
username: ${{ secrets.DOCKER_USERNAME }}
62-
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
63-
64-
###############################################
65-
# Build/Push the 'dspace/dspace-angular' image
66-
###############################################
67-
# https://github.com/docker/metadata-action
68-
# Get Metadata for docker_build step below
69-
- name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
70-
id: meta_build
71-
uses: docker/metadata-action@v4
72-
with:
73-
images: dspace/dspace-angular
74-
tags: ${{ env.IMAGE_TAGS }}
75-
flavor: ${{ env.TAGS_FLAVOR }}
76-
77-
# https://github.com/docker/build-push-action
78-
- name: Build and push 'dspace-angular' image
79-
id: docker_build
80-
uses: docker/build-push-action@v3
81-
with:
82-
context: .
83-
file: ./Dockerfile
84-
platforms: ${{ env.PLATFORMS }}
85-
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
86-
# but we ONLY do an image push to DockerHub if it's NOT a PR
87-
push: ${{ github.event_name != 'pull_request' }}
88-
# Use tags / labels provided by 'docker/metadata-action' above
89-
tags: ${{ steps.meta_build.outputs.tags }}
90-
labels: ${{ steps.meta_build.outputs.labels }}
91-
92-
#####################################################
93-
# Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
94-
#####################################################
95-
# https://github.com/docker/metadata-action
96-
# Get Metadata for docker_build_dist step below
97-
- name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image
98-
id: meta_build_dist
99-
uses: docker/metadata-action@v4
100-
with:
101-
images: dspace/dspace-angular
102-
tags: ${{ env.IMAGE_TAGS }}
103-
# As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
104-
# tagging logic as the primary 'dspace/dspace-angular' image above.
105-
flavor: ${{ env.TAGS_FLAVOR }}
106-
suffix=-dist
107-
108-
- name: Build and push 'dspace-angular-dist' image
109-
id: docker_build_dist
110-
uses: docker/build-push-action@v3
111-
with:
112-
context: .
113-
file: ./Dockerfile.dist
114-
platforms: ${{ env.PLATFORMS }}
115-
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
116-
# but we ONLY do an image push to DockerHub if it's NOT a PR
117-
push: ${{ github.event_name != 'pull_request' }}
118-
# Use tags / labels provided by 'docker/metadata-action' above
119-
tags: ${{ steps.meta_build_dist.outputs.tags }}
120-
labels: ${{ steps.meta_build_dist.outputs.labels }}
28+
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
29+
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
30+
with:
31+
build_id: dspace-angular-dev
32+
image_name: dspace/dspace-angular
33+
dockerfile_path: ./Dockerfile
34+
secrets:
35+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
36+
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
37+
38+
#############################################################
39+
# Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
40+
#############################################################
41+
dspace-angular-dist:
42+
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
43+
if: github.repository == 'dspace/dspace-angular'
44+
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
45+
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@dspace-7_x
46+
with:
47+
build_id: dspace-angular-dist
48+
image_name: dspace/dspace-angular
49+
dockerfile_path: ./Dockerfile.dist
50+
# As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
51+
# tagging logic as the primary 'dspace/dspace-angular' image above.
52+
tags_flavor: suffix=-dist
53+
secrets:
54+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
55+
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
56+
# Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of
57+
# these sites as specified in reusable-docker-build.xml
58+
REDEPLOY_SANDBOX_URL: ${{ secrets.REDEPLOY_SANDBOX_URL }}
59+
REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }}

.github/workflows/issue_opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Only add to project board if issue is flagged as "needs triage" or has no labels
1717
# NOTE: By default we flag new issues as "needs triage" in our issue template
1818
if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
19-
uses: actions/add-to-project@v0.5.0
19+
uses: actions/add-to-project@v1.0.0
2020
# Note, the authentication token below is an ORG level Secret.
2121
# It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
2222
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token

.github/workflows/label_merge_conflicts.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# This workflow checks open PRs for merge conflicts and labels them when conflicts are found
22
name: Check for merge conflicts
33

4-
# Run whenever the "main" branch is updated
5-
# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
4+
# Run this for all pushes (i.e. merges) to 'main' or maintenance branches
65
on:
76
push:
8-
branches: [ main ]
7+
branches:
8+
- main
9+
- 'dspace-**'
910
# So that the `conflict_label_name` is removed if conflicts are resolved,
1011
# we allow this to run for `pull_request_target` so that github secrets are available.
1112
pull_request_target:
@@ -24,6 +25,8 @@ jobs:
2425
# See: https://github.com/prince-chrismc/label-merge-conflicts-action
2526
- name: Auto-label PRs with merge conflicts
2627
uses: prince-chrismc/label-merge-conflicts-action@v3
28+
# Ignore any failures -- may occur (randomly?) for older, outdated PRs.
29+
continue-on-error: true
2730
# Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
2831
# Note, the authentication token is created automatically
2932
# See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token

0 commit comments

Comments
 (0)