From c7cf12287d061a2e294e025391f8addbfbcc4c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Fri, 20 Jun 2025 12:11:50 +0200 Subject: [PATCH 1/3] build: Add rust toolchain to release web --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 09cb184a1..ee83535f9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -26,6 +26,7 @@ jobs: - name: Install dependencies run: sudo apt-get update && sudo apt-get install nodejs -y - uses: moonrepo/setup-rust@v1 + - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - run: flutter pub get - name: Prepare web run: ./scripts/prepare-web.sh From 15987cac468931d59a92387ad935893fdd8b61fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Fri, 20 Jun 2025 14:02:27 +0200 Subject: [PATCH 2/3] build: Update dockerfile to build vodozemac --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 831ba871d..39505aadf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ghcr.io/cirruslabs/flutter as builder -RUN sudo apt update && sudo apt install curl wget jq -y +RUN sudo apt update && sudo apt install curl wget jq build-essential -y WORKDIR /tmp RUN wget https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_amd64.tar.gz @@ -8,6 +8,9 @@ RUN mv yq_linux_amd64 /usr/bin/yq COPY . /app WORKDIR /app +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y +ENV PATH="/root/.cargo/bin:${PATH}" +RUN rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu RUN ./scripts/prepare-web.sh COPY config.* /app/ RUN flutter pub get From 88cf02a5404d14052aa806bf6f38db050fffbb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Fri, 20 Jun 2025 14:05:52 +0200 Subject: [PATCH 3/3] build: Remove broken snapcraft job from release --- .github/workflows/release.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ee83535f9..550e512c2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -180,28 +180,6 @@ jobs: fi cd .. - promote_snapcraft: - runs-on: ubuntu-latest - env: - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }} - steps: - - name: Check out Git repository - uses: actions/checkout@v4 - - name: Install Snapcraft - uses: samuelmeuli/action-snapcraft@v3 - - name: Get Tag Name - id: tag_name - run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/})" - - name: Promote Snap - env: # Workaround for https://github.com/snapcore/snapcraft/issues/4439 - SNAPCRAFT_HAS_TTY: "true" - run: | - if [[ $GITHUB_REF_NAME == rc* ]]; then - yes | snapcraft promote fluffychat --from-channel edge --to-channel candidate - else - yes | snapcraft promote fluffychat --from-channel edge --to-channel stable - fi - deploy_docker: runs-on: ubuntu-latest permissions: