From 974bc2885cdbbddbc6ade5cbe782b0a2789bcac4 Mon Sep 17 00:00:00 2001 From: Tw93 Date: Fri, 22 Aug 2025 17:38:30 +0800 Subject: [PATCH] :bug: Fix the issue of release publishing docker --- .github/workflows/release.yml | 34 ++++++++++++---------------------- Dockerfile | 9 ++++++++- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 089fbf5..127f6ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,25 +24,24 @@ jobs: update-contributors: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write steps: - name: Checkout uses: actions/checkout@v4 with: - token: ${{ secrets.TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} + fetch-depth: 0 - name: Update Contributors in README.md uses: akhilmhdh/contributors-readme-action@v2.3.6 with: image_size: 90 columns_per_row: 7 - readme_path: README.md - use_username: false - collaborators: direct - commit_message: docs(contributor): contrib-readme-action has updated README.md - auto_detect_branch_protection: true - pr_title_on_protected: docs(contributor): contributors readme action update + auto_detect_branch_protection: false env: - GITHUB_TOKEN: ${{ secrets.TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update Contributors in README_CN.md uses: akhilmhdh/contributors-readme-action@v2.3.6 @@ -50,13 +49,9 @@ jobs: image_size: 90 columns_per_row: 7 readme_path: README_CN.md - use_username: false - collaborators: direct - commit_message: docs(contributor): contrib-readme-action has updated README_CN.md - auto_detect_branch_protection: true - pr_title_on_protected: docs(contributor): contributors readme action update + auto_detect_branch_protection: false env: - GITHUB_TOKEN: ${{ secrets.TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update Contributors in README_JP.md uses: akhilmhdh/contributors-readme-action@v2.3.6 @@ -64,13 +59,9 @@ jobs: image_size: 90 columns_per_row: 7 readme_path: README_JP.md - use_username: false - collaborators: direct - commit_message: docs(contributor): contrib-readme-action has updated README_JP.md - auto_detect_branch_protection: true - pr_title_on_protected: docs(contributor): contributors readme action update + auto_detect_branch_protection: false env: - GITHUB_TOKEN: ${{ secrets.TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Build and release popular apps release-apps: @@ -144,6 +135,5 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max + no-cache: true platforms: linux/amd64 diff --git a/Dockerfile b/Dockerfile index 24a0171..5e047b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -# Cargo build stage +# Cargo build stage - Updated to Rust 1.82 for zerovec dependency compatibility FROM rust:1.82-slim AS cargo-builder # Install Rust dependencies RUN --mount=type=cache,target=/var/cache/apt \ @@ -9,6 +9,10 @@ RUN --mount=type=cache,target=/var/cache/apt \ libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev \ libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \ gnome-video-effects + +# Verify Rust version +RUN rustc --version && echo "Rust version verified" + COPY . /pake WORKDIR /pake/src-tauri # Build cargo packages and store cache @@ -33,6 +37,9 @@ RUN --mount=type=cache,target=/var/cache/apt \ libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev \ gnome-video-effects +# Verify Rust version in builder stage +RUN rustc --version && echo "Builder stage Rust version verified" + # Install Node.js 22.x RUN --mount=type=cache,target=/var/cache/apt \ curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \