Skip to content

Commit

Permalink
Merge branch 'develop' into feat/553-collection-page-share
Browse files Browse the repository at this point in the history
  • Loading branch information
g-saracca committed Dec 17, 2024
2 parents bcc0628 + a14929c commit 0dbc485
Show file tree
Hide file tree
Showing 92 changed files with 9,938 additions and 1,927 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/deploy-beta-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ jobs:
- name: Build with base path
run: npm run build -- --base=/spa

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

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

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: built-site
path: ./dist
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,11 @@ 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@v3
- uses: actions/upload-artifact@v4
with:
name: built-site
path: ./dist
include-hidden-files: true

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

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
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@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
Expand Down
Loading

0 comments on commit 0dbc485

Please sign in to comment.