diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8d9e4af1..81d08e9a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -79,7 +79,6 @@ jobs: platforms: linux/amd64,linux/arm64 tags: ${{ env.ALL_TAGS }} build-args: | - BUILDKIT_INLINE_CACHE=1 BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 labels: | org.opencontainers.image.source=https://github.com/${{ github.repository }} @@ -87,7 +86,7 @@ jobs: org.opencontainers.image.created=${{ github.run_id }} cache-from: type=gha cache-to: type=gha,mode=max - outputs: type=registry,compression=gzip,compression-level=9 + outputs: type=registry,compression=zstd - name: Cleanup Docker if: always() diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index 3875e364..186a3e8e 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -44,22 +44,7 @@ jobs: cache: "npm" - name: Install dependencies - run: | - $maxAttempts = 3 - $attempt = 1 - while ($attempt -le $maxAttempts) { - try { - npm ci - break - } catch { - if ($attempt -eq $maxAttempts) { - Write-Error "npm ci failed after $maxAttempts attempts" - exit 1 - } - Start-Sleep -Seconds 10 - $attempt++ - } - } + run: npm ci - name: Get version id: package-version @@ -148,24 +133,14 @@ jobs: node-version-file: ".nvmrc" cache: "npm" - - name: Install system dependencies for AppImage + - name: Install system dependencies run: | sudo apt-get update - sudo apt-get install -y libfuse2 + sudo apt-get install -y libfuse2 flatpak flatpak-builder imagemagick - name: Install dependencies run: | - for i in 1 2 3; - do - if npm ci; then - break - else - if [ $i -eq 3 ]; then - exit 1 - fi - sleep 10 - fi - done + npm ci npm install --force @rollup/rollup-linux-x64-gnu npm install --force @rollup/rollup-linux-arm64-gnu npm install --force @rollup/rollup-linux-arm-gnueabihf @@ -267,11 +242,6 @@ jobs: path: release/termix_linux_armv7l_portable.tar.gz retention-days: 30 - - name: Install Flatpak builder and dependencies - run: | - sudo apt-get update - sudo apt-get install -y flatpak flatpak-builder imagemagick - - name: Add Flathub repository run: | sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo @@ -373,17 +343,7 @@ jobs: - name: Install dependencies run: | - for i in 1 2 3; - do - if npm ci; then - break - else - if [ $i -eq 3 ]; then - exit 1 - fi - sleep 10 - fi - done + npm ci npm install --force @rollup/rollup-darwin-arm64 npm install dmg-license @@ -490,11 +450,11 @@ jobs: APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} NODE_OPTIONS: --max-old-space-size=4096 + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [ "${{ steps.check_certs.outputs.has_certs }}" != "true" ]; then npm run build fi - export GH_TOKEN="${{ secrets.GITHUB_TOKEN }}" npx electron-builder --mac dmg --universal --x64 --arm64 --publish never - name: Upload macOS MAS PKG @@ -735,7 +695,7 @@ jobs: echo "appimage_arm64_name=$APPIMAGE_ARM64_NAME" >> $GITHUB_OUTPUT echo "checksum_arm64=$CHECKSUM_ARM64" >> $GITHUB_OUTPUT - - name: Install ImageMagick for icon generation + - name: Install dependencies run: | sudo apt-get update sudo apt-get install -y imagemagick @@ -900,17 +860,7 @@ jobs: - name: Install dependencies run: | - for i in 1 2 3; - do - if npm ci; then - break - else - if [ $i -eq 3 ]; then - exit 1 - fi - sleep 10 - fi - done + npm ci npm install --force @rollup/rollup-darwin-arm64 npm install dmg-license