Skip to content

Commit 76359d1

Browse files
committed
merged upstream develop
2 parents 11e7de7 + 78ac64b commit 76359d1

275 files changed

Lines changed: 11444 additions & 2948 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/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Set update schedule for GitHub Actions
2+
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
3+
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
# Check for updates to GitHub Actions daily
11+
interval: "daily"

.github/workflows/container_app_pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
if: ${{ github.repository_owner == 'IQSS' }}
2121
steps:
2222
# Checkout the pull request code as when merged
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
with:
2525
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
26-
- uses: actions/setup-java@v3
26+
- uses: actions/setup-java@v4
2727
with:
2828
java-version: "17"
2929
distribution: 'adopt'
30-
- uses: actions/cache@v3
30+
- uses: actions/cache@v4
3131
with:
3232
path: ~/.m2
3333
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -87,7 +87,7 @@ jobs:
8787
:ship: [See on GHCR](https://github.com/orgs/gdcc/packages/container). Use by referencing with full name as printed above, mind the registry name.
8888
8989
# Leave a note when things have gone sideways
90-
- uses: peter-evans/create-or-update-comment@v3
90+
- uses: peter-evans/create-or-update-comment@v4
9191
if: ${{ failure() }}
9292
with:
9393
issue-number: ${{ github.event.client_payload.pull_request.number }}

.github/workflows/container_app_push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ jobs:
6868
if: ${{ github.event_name != 'pull_request' && github.ref_name == 'develop' && github.repository_owner == 'IQSS' }}
6969
runs-on: ubuntu-latest
7070
steps:
71-
- uses: actions/checkout@v3
72-
- uses: peter-evans/dockerhub-description@v3
71+
- uses: actions/checkout@v4
72+
- uses: peter-evans/dockerhub-description@v4
7373
with:
7474
username: ${{ secrets.DOCKERHUB_USERNAME }}
7575
password: ${{ secrets.DOCKERHUB_TOKEN }}
7676
repository: gdcc/dataverse
7777
short-description: "Dataverse Application Container Image providing the executable"
7878
readme-filepath: ./src/main/docker/README.md
79-
- uses: peter-evans/dockerhub-description@v3
79+
- uses: peter-evans/dockerhub-description@v4
8080
with:
8181
username: ${{ secrets.DOCKERHUB_USERNAME }}
8282
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/deploy_beta_testing.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ on:
55
branches:
66
- develop
77

8+
concurrency:
9+
group: deploy-beta-testing
10+
cancel-in-progress: false
11+
812
jobs:
913
build:
1014
runs-on: ubuntu-latest
1115

1216
steps:
13-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1418

15-
- uses: actions/setup-java@v3
19+
- uses: actions/setup-java@v4
1620
with:
1721
distribution: 'zulu'
1822
java-version: '17'
@@ -32,7 +36,7 @@ jobs:
3236
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
3337

3438
- name: Upload war artifact
35-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
3640
with:
3741
name: built-app
3842
path: ./target/${{ env.war_file }}
@@ -42,10 +46,10 @@ jobs:
4246
runs-on: ubuntu-latest
4347

4448
steps:
45-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
4650

4751
- name: Download war artifact
48-
uses: actions/download-artifact@v3
52+
uses: actions/download-artifact@v4
4953
with:
5054
name: built-app
5155
path: ./

.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@v2
13+
- uses: actions/checkout@v4
1414
- uses: uncch-rdmc/sphinx-action@master
1515
with:
1616
docs-folder: "doc/sphinx-guides/"

.github/workflows/maven_unit_test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
steps:
3333
# TODO: As part of #10618 change to setup-maven custom action
3434
# Basic setup chores
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636
- name: Set up JDK ${{ matrix.jdk }}
37-
uses: actions/setup-java@v3
37+
uses: actions/setup-java@v4
3838
with:
3939
java-version: ${{ matrix.jdk }}
4040
distribution: temurin
@@ -57,7 +57,7 @@ jobs:
5757

5858
# Upload the built war file. For download, it will be wrapped in a ZIP by GitHub.
5959
# See also https://github.com/actions/upload-artifact#zipped-artifact-downloads
60-
- uses: actions/upload-artifact@v3
60+
- uses: actions/upload-artifact@v4
6161
with:
6262
name: dataverse-java${{ matrix.jdk }}.war
6363
path: target/dataverse*.war
@@ -67,7 +67,7 @@ jobs:
6767
- run: |
6868
tar -cvf java-builddir.tar target
6969
tar -cvf java-m2-selection.tar ~/.m2/repository/io/gdcc/dataverse-*
70-
- uses: actions/upload-artifact@v3
70+
- uses: actions/upload-artifact@v4
7171
with:
7272
name: java-artifacts
7373
path: |
@@ -98,16 +98,16 @@ jobs:
9898
steps:
9999
# TODO: As part of #10618 change to setup-maven custom action
100100
# Basic setup chores
101-
- uses: actions/checkout@v3
101+
- uses: actions/checkout@v4
102102
- name: Set up JDK ${{ matrix.jdk }}
103-
uses: actions/setup-java@v3
103+
uses: actions/setup-java@v4
104104
with:
105105
java-version: ${{ matrix.jdk }}
106106
distribution: temurin
107107
cache: maven
108108

109109
# Get the build output from the unit test job
110-
- uses: actions/download-artifact@v3
110+
- uses: actions/download-artifact@v4
111111
with:
112112
name: java-artifacts
113113
- run: |
@@ -119,7 +119,7 @@ jobs:
119119

120120
# Wrap up and send to coverage job
121121
- run: tar -cvf java-reportdir.tar target/site
122-
- uses: actions/upload-artifact@v3
122+
- uses: actions/upload-artifact@v4
123123
with:
124124
name: java-reportdir
125125
path: java-reportdir.tar
@@ -132,15 +132,15 @@ jobs:
132132
steps:
133133
# TODO: As part of #10618 change to setup-maven custom action
134134
# Basic setup chores
135-
- uses: actions/checkout@v3
136-
- uses: actions/setup-java@v3
135+
- uses: actions/checkout@v4
136+
- uses: actions/setup-java@v4
137137
with:
138138
java-version: '17'
139139
distribution: temurin
140140
cache: maven
141141

142142
# Get the build output from the integration test job
143-
- uses: actions/download-artifact@v3
143+
- uses: actions/download-artifact@v4
144144
with:
145145
name: java-reportdir
146146
- 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@v3
12+
uses: peter-evans/slash-command-dispatch@v4
1313
with:
1414
# This token belongs to @dataversebot and has sufficient scope.
1515
token: ${{ secrets.GHCR_TOKEN }}

.github/workflows/reviewdog_checkstyle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Checkstyle job
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
- name: Run check style
1515
uses: nikitasavinov/checkstyle-action@master
1616
with:

.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
permissions:
2222
pull-requests: write
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
- name: shellcheck
2626
uses: reviewdog/action-shellcheck@v1
2727
with:

.github/workflows/shellspec.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Install shellspec
2121
run: curl -fsSL https://git.io/shellspec | sh -s ${{ env.SHELLSPEC_VERSION }} --yes
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- name: Run Shellspec
2424
run: |
2525
cd tests/shell
@@ -30,7 +30,7 @@ jobs:
3030
container:
3131
image: rockylinux/rockylinux:9
3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v4
3434
- name: Install shellspec
3535
run: |
3636
curl -fsSL https://github.com/shellspec/shellspec/releases/download/${{ env.SHELLSPEC_VERSION }}/shellspec-dist.tar.gz | tar -xz -C /usr/share
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- name: Install shellspec
4949
run: curl -fsSL https://git.io/shellspec | sh -s 0.28.1 --yes
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v4
5151
- name: Run Shellspec
5252
run: |
5353
cd tests/shell

0 commit comments

Comments
 (0)