Skip to content

Commit 52e538a

Browse files
landreevlandreev
authored
Merge branch 'IQSS:develop' into Anubis_fix
2 parents 9823605 + f214ee4 commit 52e538a

File tree

341 files changed

+17980
-3043
lines changed

Some content is hidden

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

341 files changed

+17980
-3043
lines changed

‎.github/actions/setup-maven/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
2424
- name: Set up JDK ${{ env.JAVA_VERSION }}
2525
id: setup-java
26-
uses: actions/setup-java@v4
26+
uses: actions/setup-java@v5
2727
with:
2828
java-version: ${{ env.JAVA_VERSION }}
2929
distribution: 'temurin'

‎.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: 3 additions & 3 deletions
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`
@@ -71,7 +71,7 @@ jobs:
7171

7272
# Initializes the CodeQL tools for scanning.
7373
- name: Initialize CodeQL
74-
uses: github/codeql-action/init@v3
74+
uses: github/codeql-action/init@v4
7575
with:
7676
languages: ${{ matrix.language }}
7777
build-mode: ${{ matrix.build-mode }}
@@ -99,6 +99,6 @@ jobs:
9999
exit 1
100100
101101
- name: Perform CodeQL Analysis
102-
uses: github/codeql-action/analyze@v3
102+
uses: github/codeql-action/analyze@v4
103103
with:
104104
category: "/language:${{matrix.language}}"

‎.github/workflows/container_app_pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ 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'
26-
- uses: actions/setup-java@v4
26+
- uses: actions/setup-java@v5
2727
with:
2828
java-version: "17"
2929
distribution: 'adopt'
@@ -86,7 +86,7 @@ jobs:
8686
:ship: [See on GHCR](https://github.com/orgs/gdcc/packages/container). Use by referencing with full name as printed above, mind the registry name.
8787
8888
# Leave a note when things have gone sideways
89-
- uses: peter-evans/create-or-update-comment@v4
89+
- uses: peter-evans/create-or-update-comment@v5
9090
if: ${{ failure() }}
9191
with:
9292
issue-number: ${{ github.event.client_payload.pull_request.number }}

‎.github/workflows/container_maintenance.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -218,7 +218,7 @@ jobs:
218218
cat "./modules/container-base/README.md"
219219
- name: Push description to DockerHub for base image
220220
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.base-image.outputs.rebuilt_images) != '[]' }}
221-
uses: peter-evans/dockerhub-description@v4
221+
uses: peter-evans/dockerhub-description@v5
222222
with:
223223
username: ${{ secrets.DOCKERHUB_USERNAME }}
224224
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -243,7 +243,7 @@ jobs:
243243
cat "./src/main/docker/README.md"
244244
- name: Push description to DockerHub for application image
245245
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.application-image.outputs.rebuilt_images) != '[]' }}
246-
uses: peter-evans/dockerhub-description@v4
246+
uses: peter-evans/dockerhub-description@v5
247247
with:
248248
username: ${{ secrets.DOCKERHUB_USERNAME }}
249249
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -268,7 +268,7 @@ jobs:
268268
cat "./modules/container-configbaker/README.md"
269269
- name: Push description to DockerHub for config baker image
270270
if: ${{ ! inputs.dry_run && ! inputs.damp_run && toJSON(needs.configbaker-image.outputs.rebuilt_images) != '[]' }}
271-
uses: peter-evans/dockerhub-description@v4
271+
uses: peter-evans/dockerhub-description@v5
272272
with:
273273
username: ${{ secrets.DOCKERHUB_USERNAME }}
274274
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/deploy_beta_testing.yml‎

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

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

19-
- uses: actions/setup-java@v4
19+
- uses: actions/setup-java@v5
2020
with:
2121
distribution: 'zulu'
2222
java-version: '17'
@@ -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@v6
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@v6
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/[email protected].2
72+
uses: appleboy/[email protected].4
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,11 +32,11 @@ 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 }}
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
java-version: ${{ env.JAVA_VERSION }}
4242
distribution: temurin
@@ -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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ 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 }}
42-
uses: actions/setup-java@v4
42+
uses: actions/setup-java@v5
4343
with:
4444
java-version: ${{ matrix.jdk }}
4545
distribution: temurin
@@ -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@v6
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@v6
7676
with:
7777
name: java-artifacts
7878
path: |
@@ -103,16 +103,16 @@ 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 }}
108-
uses: actions/setup-java@v4
108+
uses: actions/setup-java@v5
109109
with:
110110
java-version: ${{ matrix.jdk }}
111111
distribution: temurin
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@v6
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@v6
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
141-
- uses: actions/setup-java@v4
140+
- uses: actions/checkout@v6
141+
- 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@v6
149149
with:
150150
name: java-reportdir
151151
- run: tar -xvf java-reportdir.tar

‎.github/workflows/pr_comment_commands.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Dispatch
12-
uses: peter-evans/slash-command-dispatch@v4
12+
uses: peter-evans/slash-command-dispatch@v5
1313
with:
1414
# This token belongs to @dataversebot and has sufficient scope.
1515
token: ${{ secrets.GHCR_TOKEN }}

0 commit comments

Comments
 (0)