From b37372700a4f031b07f5400fa7b528ed7ce1dee8 Mon Sep 17 00:00:00 2001 From: Oz Date: Wed, 4 Dec 2024 10:52:38 +0200 Subject: [PATCH] use cargo 1.75 --- .github/workflows/main.yml | 11 ++++++++--- justfile | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 400e67f..b033417 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - oz/ci tags: ['*'] workflow_dispatch: @@ -15,7 +16,9 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install dependencies - run: brew install just ninja + run: | + brew install just ninja + rustup install 1.75.0 - name: Clone run: just clone - name: Prepare @@ -44,8 +47,10 @@ jobs: - uses: actions/checkout@v4 - name: Install just uses: taiki-e/install-action@just - - name: Install ninja - run: sudo apt update; sudo apt install ninja-build + - name: Install dependencies + run: | + sudo apt update; sudo apt install ninja-build + rustup install 1.75.0 - name: Clone run: just clone - name: Prepare diff --git a/justfile b/justfile index 28f11d5..2093e84 100644 --- a/justfile +++ b/justfile @@ -30,11 +30,11 @@ build-cargo: # AG: this fails for me with macport and libiconv # AG: I have to disable libiconv, run this manually # AG: and then re-enable it - cd {{ out_dir }}/cargo && cargo update && env OPENSSL_STATIC=1 cargo build --release + cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 cargo +1.75 build --release [linux] build-cargo: - cd {{ out_dir }}/cargo && cargo update && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo build --release + cd {{ out_dir }}/cargo && env OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include/openssl cargo +1.75 build --release [linux,macos]