Skip to content

Commit

Permalink
use cargo 1.75
Browse files Browse the repository at this point in the history
  • Loading branch information
ozcodes committed Dec 4, 2024
1 parent e76ca45 commit b373727
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- oz/ci
tags: ['*']
workflow_dispatch:

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit b373727

Please sign in to comment.