Skip to content

Commit 1c31c15

Browse files
jp-toscajp-tosca
committed
Merge remote-tracking branch 'origin/develop' into storage-driver-endpoint
2 parents 2a7bca4 + 7b3137b commit 1c31c15

41 files changed

Lines changed: 706 additions & 546 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_maintenance.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ jobs:
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_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 }}

‎doc/release-notes/11085-suppress-breadcrumbs‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎doc/release-notes/11206-refresh-landing-page-after-delete.md‎

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

‎doc/release-notes/11254-croissant-builtin.md‎

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

‎doc/release-notes/11473-harvesting-client-improvements.md‎

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

‎doc/release-notes/11606-hide-spa-oidc-providers-from-jsf-login-screen.md‎

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

‎doc/release-notes/11670-notification-of-moved-datasets.md‎

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

0 commit comments

Comments
 (0)
⚡