Skip to content

Commit 279b282

Browse files
stevenwinshipstevenwinship
authored
Merge branch 'develop' into feat/list-assignments-more-info
2 parents 323e6c2 + b8e629e commit 279b282

412 files changed

Lines changed: 22846 additions & 3218 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/workflows/check_property_files.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Duplicate Keys
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- name: Run duplicates detection script
1414
shell: bash
1515
run: tests/check_duplicate_properties.sh
@@ -18,7 +18,7 @@ jobs:
1818
name: Metadata Blocks Properties
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
- name: Setup GraalVM + Native Image
2323
uses: graalvm/setup-graalvm@v1
2424
with:

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
6262
steps:
6363
- name: Checkout repository
64-
uses: actions/checkout@v5
64+
uses: actions/checkout@v6
6565

6666
# Add any setup steps before running the `github/codeql-action/init` action.
6767
# This includes steps like installing compilers or runtimes (`actions/setup-node`

‎.github/workflows/container_app_pr.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,29 @@ jobs:
2020
if: ${{ github.repository_owner == 'IQSS' }}
2121
steps:
2222
# Checkout the pull request code as when merged
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
with:
2525
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
2626
- uses: actions/setup-java@v5
2727
with:
2828
java-version: "17"
2929
distribution: 'adopt'
30-
- uses: actions/cache@v4
30+
- uses: actions/cache@v5
3131
with:
3232
path: ~/.m2
3333
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3434
restore-keys: ${{ runner.os }}-m2
3535

3636
# Note: Accessing, pushing tags etc. to GHCR will only succeed in upstream because secrets.
3737
- name: Login to Github Container Registry
38-
uses: docker/login-action@v3
38+
uses: docker/login-action@v4
3939
with:
4040
registry: ghcr.io
4141
username: ${{ secrets.GHCR_USERNAME }}
4242
password: ${{ secrets.GHCR_TOKEN }}
4343

4444
- name: Set up QEMU for multi-arch builds
45-
uses: docker/setup-qemu-action@v3
45+
uses: docker/setup-qemu-action@v4
4646

4747
# Get the image tag from either the command or default to branch name (Not used for now)
4848
#- name: Get the target tag name

‎.github/workflows/container_app_push.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,20 @@ jobs:
101101
# Depending on context, we push to different targets. Login accordingly.
102102
- if: github.event_name != 'pull_request'
103103
name: Log in to Docker Hub registry
104-
uses: docker/login-action@v3
104+
uses: docker/login-action@v4
105105
with:
106106
username: ${{ secrets.DOCKERHUB_USERNAME }}
107107
password: ${{ secrets.DOCKERHUB_TOKEN }}
108108
- if: ${{ github.event_name == 'pull_request' }}
109109
name: Login to Github Container Registry
110-
uses: docker/login-action@v3
110+
uses: docker/login-action@v4
111111
with:
112112
registry: ghcr.io
113113
username: ${{ secrets.GHCR_USERNAME }}
114114
password: ${{ secrets.GHCR_TOKEN }}
115115

116116
- name: Set up QEMU for multi-arch builds
117-
uses: docker/setup-qemu-action@v3
117+
uses: docker/setup-qemu-action@v4
118118

119119
- name: Add rolling image tag when pushing to develop
120120
if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}

‎.github/workflows/container_base_push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
4343
# on events in context of upstream because secrets. PRs run in context of forks by default!
4444
- name: Log in to the Container registry
45-
uses: docker/login-action@v3
45+
uses: docker/login-action@v4
4646
with:
4747
username: ${{ secrets.DOCKERHUB_USERNAME }}
4848
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/container_maintenance.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ jobs:
7979
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
8080
# on events in context of upstream because secrets. PRs run in context of forks by default!
8181
- name: Log in to the Container registry
82-
uses: docker/login-action@v3
82+
uses: docker/login-action@v4
8383
with:
8484
username: ${{ secrets.DOCKERHUB_USERNAME }}
8585
password: ${{ secrets.DOCKERHUB_TOKEN }}
8686
- name: Set up QEMU for multi-arch builds
87-
uses: docker/setup-qemu-action@v3
87+
uses: docker/setup-qemu-action@v4
8888
with:
8989
platforms: ${{ env.PLATFORMS }}
9090

@@ -122,12 +122,12 @@ jobs:
122122
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
123123
# on events in context of upstream because secrets. PRs run in context of forks by default!
124124
- name: Log in to the Container registry
125-
uses: docker/login-action@v3
125+
uses: docker/login-action@v4
126126
with:
127127
username: ${{ secrets.DOCKERHUB_USERNAME }}
128128
password: ${{ secrets.DOCKERHUB_TOKEN }}
129129
- name: Set up QEMU for multi-arch builds
130-
uses: docker/setup-qemu-action@v3
130+
uses: docker/setup-qemu-action@v4
131131
with:
132132
platforms: ${{ env.PLATFORMS }}
133133

@@ -164,16 +164,16 @@ jobs:
164164
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
165165
# on events in context of upstream because secrets. PRs run in context of forks by default!
166166
- name: Log in to the Container registry
167-
uses: docker/login-action@v3
167+
uses: docker/login-action@v4
168168
with:
169169
username: ${{ secrets.DOCKERHUB_USERNAME }}
170170
password: ${{ secrets.DOCKERHUB_TOKEN }}
171171
- name: Set up QEMU for multi-arch builds
172-
uses: docker/setup-qemu-action@v3
172+
uses: docker/setup-qemu-action@v4
173173
with:
174174
platforms: ${{ env.PLATFORMS }}
175175
- name: Setup Trivy binary for vulnerability scanning
176-
uses: aquasecurity/setup-trivy@v0.2.4
176+
uses: aquasecurity/setup-trivy@v0.2.5
177177
with:
178178
version: v0.63.0
179179

@@ -199,7 +199,7 @@ jobs:
199199
- configbaker-image
200200
steps:
201201
- name: Checkout repository
202-
uses: actions/checkout@v5
202+
uses: actions/checkout@v6
203203

204204
### BASE IMAGE
205205
- name: Render README for base image

‎.github/workflows/deploy_beta_testing.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818

1919
- uses: actions/setup-java@v5
2020
with:
@@ -36,7 +36,7 @@ jobs:
3636
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
3737

3838
- name: Upload war artifact
39-
uses: actions/upload-artifact@v4
39+
uses: actions/upload-artifact@v7
4040
with:
4141
name: built-app
4242
path: ./target/${{ env.war_file }}
@@ -47,10 +47,10 @@ jobs:
4747
runs-on: ubuntu-latest
4848

4949
steps:
50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151

5252
- name: Download war artifact
53-
uses: actions/download-artifact@v5
53+
uses: actions/download-artifact@v8
5454
with:
5555
name: built-app
5656
path: ./
@@ -69,7 +69,7 @@ jobs:
6969
overwrite: true
7070

7171
- name: Execute payara war deployment remotely
72-
uses: appleboy/ssh-action@v1.2.2
72+
uses: appleboy/ssh-action@v1.2.5
7373
env:
7474
INPUT_WAR_FILE: ${{ env.war_file }}
7575
with:

‎.github/workflows/guides_build_sphinx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
docs:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- id: lookup
1515
run: |
1616
echo "sphinx_version=$(grep Sphinx== ./doc/sphinx-guides/requirements.txt | tr -s "=" | cut -f 2 -d=)" | tee -a "${GITHUB_OUTPUT}"

‎.github/workflows/maven_cache_management.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
contents: read
3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
- name: Determine Java version from Parent POM
3737
run: echo "JAVA_VERSION=$(grep '<target.java.version>' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV}
3838
- name: Set up JDK ${{ env.JAVA_VERSION }}
@@ -62,7 +62,7 @@ jobs:
6262
env:
6363
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6464
- name: Save the common cache
65-
uses: actions/cache@v4
65+
uses: actions/cache@v5
6666
with:
6767
path: ${{ env.COMMON_CACHE_PATH }}
6868
key: ${{ env.COMMON_CACHE_KEY }}
@@ -80,7 +80,7 @@ jobs:
8080
contents: read
8181
steps:
8282
- name: Checkout repository
83-
uses: actions/checkout@v5
83+
uses: actions/checkout@v6
8484
- name: Cleanup caches
8585
run: |
8686
gh extension install actions/gh-actions-cache

‎.github/workflows/maven_unit_test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838
# TODO: As part of #10618 change to setup-maven custom action
3939
# Basic setup chores
40-
- uses: actions/checkout@v5
40+
- uses: actions/checkout@v6
4141
- name: Set up JDK ${{ matrix.jdk }}
4242
uses: actions/setup-java@v5
4343
with:
@@ -62,7 +62,7 @@ jobs:
6262

6363
# Upload the built war file. For download, it will be wrapped in a ZIP by GitHub.
6464
# See also https://github.com/actions/upload-artifact#zipped-artifact-downloads
65-
- uses: actions/upload-artifact@v4
65+
- uses: actions/upload-artifact@v7
6666
with:
6767
name: dataverse-java${{ matrix.jdk }}.war
6868
path: target/dataverse*.war
@@ -72,7 +72,7 @@ jobs:
7272
- run: |
7373
tar -cvf java-builddir.tar target
7474
tar -cvf java-m2-selection.tar ~/.m2/repository/io/gdcc/dataverse-*
75-
- uses: actions/upload-artifact@v4
75+
- uses: actions/upload-artifact@v7
7676
with:
7777
name: java-artifacts
7878
path: |
@@ -103,7 +103,7 @@ jobs:
103103
steps:
104104
# TODO: As part of #10618 change to setup-maven custom action
105105
# Basic setup chores
106-
- uses: actions/checkout@v5
106+
- uses: actions/checkout@v6
107107
- name: Set up JDK ${{ matrix.jdk }}
108108
uses: actions/setup-java@v5
109109
with:
@@ -112,7 +112,7 @@ jobs:
112112
cache: maven
113113

114114
# Get the build output from the unit test job
115-
- uses: actions/download-artifact@v5
115+
- uses: actions/download-artifact@v8
116116
with:
117117
name: java-artifacts
118118
- run: |
@@ -124,7 +124,7 @@ jobs:
124124

125125
# Wrap up and send to coverage job
126126
- run: tar -cvf java-reportdir.tar target/site
127-
- uses: actions/upload-artifact@v4
127+
- uses: actions/upload-artifact@v7
128128
with:
129129
name: java-reportdir
130130
path: java-reportdir.tar
@@ -137,15 +137,15 @@ jobs:
137137
steps:
138138
# TODO: As part of #10618 change to setup-maven custom action
139139
# Basic setup chores
140-
- uses: actions/checkout@v5
140+
- uses: actions/checkout@v6
141141
- uses: actions/setup-java@v5
142142
with:
143143
java-version: '17'
144144
distribution: temurin
145145
cache: maven
146146

147147
# Get the build output from the integration test job
148-
- uses: actions/download-artifact@v5
148+
- uses: actions/download-artifact@v8
149149
with:
150150
name: java-reportdir
151151
- run: tar -xvf java-reportdir.tar

0 commit comments

Comments
 (0)
⚡