Skip to content

Commit 6e0054f

Browse files
qqmyersqqmyers
committed
Merge remote-tracking branch 'IQSS/develop' into DNO-supportORCIDandRORonOneField
2 parents dea0e78 + 6a144ac commit 6e0054f

223 files changed

Lines changed: 10968 additions & 3087 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/add_bugs_to_project.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Add bugs to project board
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
- labeled
8+
9+
jobs:
10+
add-to-project:
11+
name: Add bug to project
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/add-to-project@v1.0.2
15+
with:
16+
project-url: https://github.com/orgs/IQSS/projects/34
17+
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
18+
labeled: "Type: Bug"

‎.github/workflows/container_app_pr.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ jobs:
2525
ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
2626
- uses: actions/setup-java@v5
2727
with:
28-
java-version: "17"
28+
java-version: "21"
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
@@ -69,7 +69,7 @@ jobs:
6969
-Dapp.image.tag=${{ env.IMAGE_TAG }}
7070
-Ddocker.registry=ghcr.io -Ddocker.platforms=${{ env.PLATFORMS }}
7171
72-
- uses: marocchino/sticky-pull-request-comment@v2
72+
- uses: marocchino/sticky-pull-request-comment@v3
7373
with:
7474
header: registry-push
7575
hide_and_recreate: true

‎.github/workflows/container_app_push.yml‎

Lines changed: 4 additions & 4 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' }}
@@ -141,7 +141,7 @@ jobs:
141141
${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }}
142142
-P ct deploy
143143
144-
- uses: marocchino/sticky-pull-request-comment@v2
144+
- uses: marocchino/sticky-pull-request-comment@v3
145145
if: ${{ github.event_name == 'pull_request' }}
146146
with:
147147
header: registry-push

‎.github/workflows/container_base_push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ 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 }}
4949

5050
# In case this is a push to develop, we care about buildtime.
5151
# Configure a remote ARM64 build host in addition to the local AMD64 in two steps.
5252
- name: Setup SSH agent
53-
uses: webfactory/ssh-agent@v0.9.1
53+
uses: webfactory/ssh-agent@v0.10.0
5454
with:
5555
ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }}
5656
- name: Provide the known hosts key and the builder config

‎.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,18 +164,18 @@ 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.5
176+
uses: aquasecurity/setup-trivy@v0.2.6
177177
with:
178-
version: v0.63.0
178+
version: v0.69.3
179179

180180
# Execute matrix build for the discovered branches
181181
- name: Execute build matrix script

‎.github/workflows/deploy_beta_testing.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-java@v5
2020
with:
2121
distribution: 'zulu'
22-
java-version: '17'
22+
java-version: '21'
2323

2424
- name: Enable API Session Auth feature flag
2525
working-directory: src/main/resources/META-INF
@@ -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@v6
39+
uses: actions/upload-artifact@v7
4040
with:
4141
name: built-app
4242
path: ./target/${{ env.war_file }}
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@v6
5151

5252
- name: Download war artifact
53-
uses: actions/download-artifact@v6
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.4
72+
uses: appleboy/ssh-action@v1.2.5
7373
env:
7474
INPUT_WAR_FILE: ${{ env.war_file }}
7575
with:
@@ -79,11 +79,11 @@ jobs:
7979
envs: INPUT_WAR_FILE
8080
script: |
8181
APPLICATION_NAME=dataverse-backend
82-
ASADMIN='/usr/local/payara6/bin/asadmin --user admin'
82+
ASADMIN='/usr/local/payara7/bin/asadmin --user admin'
8383
$ASADMIN undeploy $APPLICATION_NAME
8484
#$ASADMIN stop-domain
85-
#rm -rf /usr/local/payara6/glassfish/domains/domain1/generated
86-
#rm -rf /usr/local/payara6/glassfish/domains/domain1/osgi-cache
85+
#rm -rf /usr/local/payara7/glassfish/domains/domain1/generated
86+
#rm -rf /usr/local/payara7/glassfish/domains/domain1/osgi-cache
8787
#$ASADMIN start-domain
8888
$ASADMIN deploy --name $APPLICATION_NAME $INPUT_WAR_FILE
8989
#$ASADMIN stop-domain

‎.github/workflows/deploy_to_internal.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: 'Deploy to dataverse-internal.iq.harvard.edu'
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
buildlabel:
7+
description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry). Leaving it empty will default to the legacy behavior, i.e. " build <branch>-<checksum>".'
8+
type: string
9+
required: false
10+
11+
permissions:
12+
contents: read
13+
14+
concurrency:
15+
group: deploy-to-internal
16+
cancel-in-progress: false
17+
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- uses: actions/checkout@v6
24+
25+
- uses: actions/setup-java@v5
26+
with:
27+
distribution: 'zulu'
28+
java-version: '21'
29+
30+
- name: Set build number
31+
run: scripts/installer/custom-build-number "${{ github.event.inputs.buildlabel }}"
32+
33+
- name: Build application war
34+
run: mvn package
35+
36+
- name: Get war file name
37+
working-directory: target
38+
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
39+
40+
- name: Upload war artifact
41+
uses: actions/upload-artifact@v7
42+
with:
43+
name: built-app
44+
path: ./target/${{ env.war_file }}
45+
46+
deploy-to-payara:
47+
needs: build
48+
if: ${{ github.repository_owner == 'IQSS' }}
49+
runs-on: ubuntu-latest
50+
51+
steps:
52+
- uses: actions/checkout@v6
53+
54+
- name: Download war artifact
55+
uses: actions/download-artifact@v8
56+
with:
57+
name: built-app
58+
path: ./
59+
60+
- name: Get war file name
61+
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
62+
63+
- name: Copy war file to remote instance
64+
uses: appleboy/scp-action@master
65+
with:
66+
host: ${{ secrets.INTERNAL_PAYARA_INSTANCE_HOST }}
67+
username: ${{ secrets.INTERNAL_PAYARA_INSTANCE_USERNAME }}
68+
key: ${{ secrets.INTERNAL_PAYARA_INSTANCE_SSH_PRIVATE_KEY }}
69+
source: './${{ env.war_file }}'
70+
target: '/home/${{ secrets.INTERNAL_PAYARA_INSTANCE_USERNAME }}'
71+
overwrite: true
72+
73+
- name: Execute payara war deployment remotely
74+
uses: appleboy/ssh-action@v1.2.5
75+
env:
76+
INPUT_WAR_FILE: ${{ env.war_file }}
77+
with:
78+
host: ${{ secrets.INTERNAL_PAYARA_INSTANCE_HOST }}
79+
username: ${{ secrets.INTERNAL_PAYARA_INSTANCE_USERNAME }}
80+
key: ${{ secrets.INTERNAL_PAYARA_INSTANCE_SSH_PRIVATE_KEY }}
81+
envs: INPUT_WAR_FILE
82+
script: |
83+
APPLICATION_NAME=dataverse-backend
84+
ASADMIN='/usr/local/payara7/bin/asadmin --user admin'
85+
$ASADMIN undeploy $APPLICATION_NAME
86+
#$ASADMIN stop-domain
87+
#$ASADMIN start-domain
88+
$ASADMIN deploy --name $APPLICATION_NAME $INPUT_WAR_FILE
89+
#$ASADMIN stop-domain
90+
#$ASADMIN start-domain

‎.github/workflows/generate_war_file.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: 'Generate dataverse war file'
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
buildlabel:
7+
description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry). Leaving it empty will default to the legacy behavior, i.e. " build <branch>-<checksum>".'
8+
type: string
9+
required: false
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v6
17+
18+
- uses: actions/setup-java@v5
19+
with:
20+
distribution: 'zulu'
21+
java-version: '21'
22+
23+
- name: Set build number
24+
run: scripts/installer/custom-build-number "${{ github.event.inputs.buildlabel }}"
25+
26+
- name: Build application war
27+
run: mvn package
28+
29+
- name: Get war file name
30+
working-directory: target
31+
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
32+
33+
- name: Upload war artifact
34+
uses: actions/upload-artifact@v7
35+
with:
36+
name: built-app
37+
path: ./target/${{ env.war_file }}

‎.github/workflows/maven_cache_management.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 }}

0 commit comments

Comments
 (0)
⚡