Skip to content

Commit

Permalink
Merge branch 'main' into dev/mikaelvallenet/feat/new-dao-with-conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
n0izn0iz authored Feb 6, 2025
2 parents a9c8714 + 042bb09 commit 417a917
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: make prepare-electron

- name: Upload web build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: electron-web-build
path: electron/web-build
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
run: yarn

- name: Download web build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: electron-web-build
path: electron/web-build
Expand All @@ -78,31 +78,31 @@ jobs:
run: make build-electron-${{ matrix.os }}-${{ matrix.arch }}

- name: Upload AppImage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'linux'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-AppImage
path: electron/dist/artifacts/local/*.AppImage
if-no-files-found: error

- name: Upload deb
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'linux'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-deb
path: electron/dist/artifacts/local/*.deb
if-no-files-found: error

- name: Upload dmg
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'macos'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-dmg
path: electron/dist/artifacts/local/*.dmg
if-no-files-found: error

- name: Upload exe
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'windows'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-exe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
run: eas submit --platform=android --path=${{ env.AAB_FILE }} --profile=production

- name: Upload aab
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: teritori-${{ github.sha }}.aab
path: ${{ env.AAB_FILE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
run: eas submit --platform=ios --path=${{ env.IPA_FILE }} --profile=production

- name: Upload IPA
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: teritori-${{ github.sha }}.ipa
path: ${{ env.IPA_FILE }}
Expand Down

0 comments on commit 417a917

Please sign in to comment.