From 42978587e37350ce24c725b3b55fb84fdfc7273c Mon Sep 17 00:00:00 2001 From: Neshura Date: Wed, 20 Dec 2023 00:13:50 +0100 Subject: [PATCH] Use rust-tauri docker image --- .forgejo/workflows/build+release.yml | 30 ++-------------------------- .forgejo/workflows/test.yml | 12 +---------- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 55f10c3..4b71f6c 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -9,18 +9,8 @@ on: jobs: run-tests: runs-on: docker - container: rust:latest + container: forgejo.neshweb.net/ci-docker-images/rust-tauri:latest steps: - - - name: Installing Node and dependencies - run: | - apt update - apt install -y \ - nodejs \ - libwebkit2gtk-4.0-dev \ - build-essential \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - name: Add Clippy run: rustup component add clippy @@ -59,7 +49,7 @@ jobs: needs: run-tests if: success() runs-on: docker - container: rust:latest + container: forgejo.neshweb.net/ci-docker-images/rust-tauri:latest steps: - name: Storing Debian Codename for Package Upload Job @@ -67,22 +57,6 @@ jobs: . /etc/os-release echo Debian Codename is: $VERSION_CODENAME echo "DEBIAN_CODENAME=$VERSION_CODENAME" >> /build.env - - - name: Installing Node, NPM - run: | - apt update - apt install -y \ - nodejs npm \ - libwebkit2gtk-4.0-dev \ - build-essential \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - - - name: Installing Yarn, Vite - run: npm install --global yarn vite - - - name: Installing Tauri CLI - run: cargo install tauri-cli - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index df32621..c18ba73 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -10,18 +10,8 @@ on: jobs: run-tests: runs-on: docker - container: rust:latest + container: forgejo.neshweb.net/ci-docker-images/rust-tauri:latest steps: - - - name: Installing Node and dependencies - run: | - apt update - apt install -y \ - nodejs \ - libwebkit2gtk-4.0-dev \ - build-essential \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - name: Add Clippy run: rustup component add clippy