Skip to content

Commit

Permalink
Revert "Upgrade to {upload,download}-artifact@v4 for better performan…
Browse files Browse the repository at this point in the history
…ce" (#1396)
  • Loading branch information
t3chguy authored Dec 20, 2023
1 parent de503fa commit 058bb09
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
environment: packages.element.io
steps:
- name: Download artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3

- name: Deploy artifacts
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Install Deps
run: "yarn install --frozen-lockfile"

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: ${{ matrix.artifact }}
path: dist
Expand All @@ -156,9 +156,9 @@ jobs:
ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }}

- name: Upload Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
if: always()
with:
name: ${{ matrix.artifact }}-test-result
name: ${{ matrix.artifact }}
path: test_artifacts
retention-days: 1
6 changes: 3 additions & 3 deletions .github/workflows/build_linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: webapp

Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:

- name: Stash deb package
if: inputs.deploy-mode
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: linux-sqlcipher-${{ inputs.sqlcipher }}-deb
path: dist/*.deb
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:

# We exclude *-unpacked as it loses permissions and the tarball contains it with correct permissions
- name: Upload Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.deploy-mode && 'packages.element.io' || format('linux-{0}-sqlcipher-{1}', inputs.arch, inputs.sqlcipher) }}
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: webapp

Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:

# We exclude mac-universal as the unpacked app takes forever to upload and zip and dmg already contain it
- name: Upload Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.deploy-mode && 'packages.element.io' || 'macos' }}
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_prepare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
echo "| React SDK | [$REACT_VERSION](https://github.com/matrix-org/matrix-react-sdk/commit/$REACT_VERSION) |" >> $GITHUB_STEP_SUMMARY
echo "| JS SDK | [$JS_VERSION](https://github.com/matrix-org/matrix-js-sdk/commit/$JS_VERSION) |" >> $GITHUB_STEP_SUMMARY
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: webapp
retention-days: 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- uses: actions/checkout@v3

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v3
with:
name: webapp

Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
working-directory: "dist/install/win32/${{ steps.config.outputs.dir }}"

- name: Upload Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.deploy-mode && 'packages.element.io' || format('win-{0}', inputs.arch) }}
path: dist
Expand Down

0 comments on commit 058bb09

Please sign in to comment.