Skip to content

Commit

Permalink
Merge branch 'feature/492-publish-dataset-with-compare-versions' of h…
Browse files Browse the repository at this point in the history
…ttps://github.com/IQSS/dataverse-frontend into feature/492-publish-dataset-with-compare-versions
  • Loading branch information
ekraffmiller committed Dec 16, 2024
2 parents 92883f3 + 8d99301 commit 7a0d850
Show file tree
Hide file tree
Showing 90 changed files with 1,910 additions and 9,902 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/deploy-beta-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ jobs:
- name: Build with base path
run: npm run build -- --base=/spa

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: built-site
path: ./dist
include-hidden-files: true

deploy-to-payara:
needs: build
Expand All @@ -59,7 +58,7 @@ jobs:
distribution: 'zulu'
java-version: '11'

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: built-site
path: ./dist
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,10 @@ jobs:
if: ${{ github.event.inputs.infra_type == 'Payara' && github.event.inputs.basepath != '' }}
run: npm run build -- --base=/${{ github.event.inputs.basepath }}

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: built-site
path: ./dist
include-hidden-files: true

deploy-to-s3:
needs: build
Expand All @@ -85,7 +84,7 @@ jobs:
python -m pip install --upgrade pip
pip install awscli
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: built-site
path: ./dist
Expand All @@ -112,7 +111,7 @@ jobs:
distribution: 'zulu'
java-version: '11'

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: built-site
path: ./dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Cypress screenshots
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-screenshots
Expand Down
Loading

0 comments on commit 7a0d850

Please sign in to comment.