Skip to content

Commit

Permalink
Merge branch 'develop' into 9692-files-api-extension-display-data #9692
Browse files Browse the repository at this point in the history
Conflicts:
doc/sphinx-guides/source/api/native-api.rst
  • Loading branch information
pdurbin committed Aug 9, 2023
2 parents 1224311 + 4073f8b commit 0c0ddae
Show file tree
Hide file tree
Showing 60 changed files with 943 additions and 544 deletions.
84 changes: 84 additions & 0 deletions .github/workflows/deploy_beta_testing.yml
@@ -0,0 +1,84 @@
name: 'Deploy to Beta Testing'

on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest
environment: beta-testing

steps:
- uses: actions/checkout@v3

- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'

- name: Enable API Session Auth feature flag
working-directory: src/main/resources/META-INF
run: echo -e "dataverse.feature.api-session-auth=true" >> microprofile-config.properties

- name: Build application war
run: mvn package

- name: Get war file name
working-directory: target
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV

- name: Upload war artifact
uses: actions/upload-artifact@v3
with:
name: built-app
path: ./target/${{ env.war_file }}

deploy-to-payara:
needs: build
runs-on: ubuntu-latest
environment: beta-testing

steps:
- uses: actions/checkout@v3

- name: Download war artifact
uses: actions/download-artifact@v3
with:
name: built-app
path: ./

- name: Get war file name
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV

- name: Copy war file to remote instance
uses: appleboy/scp-action@master
with:
host: ${{ secrets.PAYARA_INSTANCE_HOST }}
username: ${{ secrets.PAYARA_INSTANCE_USERNAME }}
key: ${{ secrets.PAYARA_INSTANCE_SSH_PRIVATE_KEY }}
source: './${{ env.war_file }}'
target: '/home/${{ secrets.PAYARA_INSTANCE_USERNAME }}'
overwrite: true

- name: Execute payara war deployment remotely
uses: appleboy/ssh-action@v1.0.0
env:
INPUT_WAR_FILE: ${{ env.war_file }}
with:
host: ${{ secrets.PAYARA_INSTANCE_HOST }}
username: ${{ secrets.PAYARA_INSTANCE_USERNAME }}
key: ${{ secrets.PAYARA_INSTANCE_SSH_PRIVATE_KEY }}
envs: INPUT_WAR_FILE
script: |
APPLICATION_NAME=dataverse-backend
ASADMIN='/usr/local/payara5/bin/asadmin --user admin'
$ASADMIN undeploy $APPLICATION_NAME
$ASADMIN stop-domain
rm -rf /usr/local/payara5/glassfish/domains/domain1/generated
rm -rf /usr/local/payara5/glassfish/domains/domain1/osgi-cache
$ASADMIN start-domain
$ASADMIN deploy --name $APPLICATION_NAME $INPUT_WAR_FILE
$ASADMIN stop-domain
$ASADMIN start-domain
1 change: 0 additions & 1 deletion doc/release-notes/1249-collapse_dataverse_description.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes/215-handles-upgrade-reminder.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/3913-delete-file-endpoint

This file was deleted.

404 changes: 404 additions & 0 deletions doc/release-notes/5.14-release-notes.md

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions doc/release-notes/5042-add-mydata-doc-api.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/6542-mdc-legacy-counts.md

This file was deleted.

30 changes: 0 additions & 30 deletions doc/release-notes/7000-pidproviders.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/8092-timestamp-of-data-access-request.md

This file was deleted.

8 changes: 0 additions & 8 deletions doc/release-notes/8424-signposting.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/8674-permalinks.md

This file was deleted.

14 changes: 0 additions & 14 deletions doc/release-notes/8822-incomplete-datasets-via-api.md

This file was deleted.

15 changes: 0 additions & 15 deletions doc/release-notes/8889-2-filepids-in-collections-changes.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/8889-filepids-in-collections.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/9063-session-api-auth.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/9100-schema.org-updates.md

This file was deleted.

28 changes: 0 additions & 28 deletions doc/release-notes/9148-license-via-api.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/9150-improved-external-vocab-supprt.md

This file was deleted.

11 changes: 0 additions & 11 deletions doc/release-notes/9175-external-exporters.md

This file was deleted.

12 changes: 0 additions & 12 deletions doc/release-notes/9185-contact-email-updates.md

This file was deleted.

9 changes: 0 additions & 9 deletions doc/release-notes/9204-group-by-file-ordering.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/9229-bearer-api-auth.md

This file was deleted.

0 comments on commit 0c0ddae

Please sign in to comment.