From 89248201195aee048cd6c1d6633494fcd742e576 Mon Sep 17 00:00:00 2001 From: Paul Delafosse Date: Thu, 25 Jan 2024 09:43:13 +0100 Subject: [PATCH] ci: update Cross config --- .github/workflows/CD.yml | 5 +---- .github/workflows/Release.yaml | 2 +- Cross.toml | 12 ++++++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 Cross.toml diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 2404ab8..54e304e 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -9,6 +9,7 @@ on: env: CARGO_TERM_COLOR: always + CROSS_CONFIG: Cross.toml jobs: upload_license: @@ -47,10 +48,6 @@ jobs: toolchain: stable target: ${{ matrix.target }} - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install libxkbcommon-dev libvulkan1 mesa-vulkan-drivers libegl1-mesa-dev - uses: actions-rs/cargo@v1 with: diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 66841f0..f0ec7c9 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -54,5 +54,5 @@ jobs: # env: # COMMIT_MESSAGE: "chore: update gh-pages" # ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# BUILD_SCRIPT: cd docs && yarn && yarn docs:build +# BUILD_SCRIPT: cd guide && yarn && yarn guide:build # BUILD_DIR: website/.vuepress/dist/ \ No newline at end of file diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..b768d0f --- /dev/null +++ b/Cross.toml @@ -0,0 +1,12 @@ +[target.x86_64-unknown-linux-gnu] +image = "ubuntu:latest" +pre-build = ["apt-get update && apt-get -y install libxkbcommon-dev libvulkan1 mesa-vulkan-drivers libegl1-mesa-dev gcc"] + +[target.x86_64-unknown-linux-musl] +image = "ubuntu:latest" +pre-build = ["apt-get update && apt-get -y install libxkbcommon-dev libvulkan1 mesa-vulkan-drivers libegl1-mesa-dev gcc"] + +[target.armv7-unknown-linux-musleabihf-unknown-linux-gnu] +image = "ubuntu:latest" +pre-build = ["apt-get update && apt-get -y install libxkbcommon-dev libvulkan1 mesa-vulkan-drivers libegl1-mesa-dev gcc"] +