Skip to content

Commit

Permalink
Bump flake and fix wasm builds; CI improvements (#108)
Browse files Browse the repository at this point in the history
* chore: nix flake update

* fix(test/build.rs): don't inherit all env vars

with a recent rust update (to 1.75.0) this breaks wasm builds as they
wrongly inherit the flags defined in
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS. as it's unclear to me
why that is, i opted to clear the entire environment which also disables
inheritance, and add only the desired necessary variables back

* refactor(github/workflows): merge mac with test and use matrix for OS selection

* chore(github/workflows/test): bump nix related actions

* chore: nix flake update

* test: don't fail fast

* debug build env vars

* fixup! debug build env vars

* Update test/build.rs

* Update test/build.rs
  • Loading branch information
steveej committed Apr 23, 2024
1 parent c585a2c commit 1ec2ba6
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 152 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/mac.yml

This file was deleted.

16 changes: 5 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,22 @@ on:
- develop
pull_request: {}

env:
HOLOCHAIN_REPO: "/var/tmp/holochain_repo"
CACHIX_REV: "v1.2"

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
script: ["./test.sh", "./bench.sh"]
os: ["ubuntu-latest", "macos-latest"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Install nix
uses: cachix/install-nix-action@v20
uses: cachix/install-nix-action@v26
- name: Setup cachix
uses: cachix/cachix-action@v12
uses: cachix/cachix-action@v14
if: ${{ ! contains(matrix.platform.runs-on, 'self-hosted') }}
with:
name: holochain-ci
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
installCommand: |
nix-env -if https://github.com/cachix/cachix/tarball/${CACHIX_REV} \
--substituters 'https://cache.nixos.org https://cachix.cachix.org' \
--trusted-public-keys 'cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY='
- run: nix develop --command ${{ matrix.script }}

0 comments on commit 1ec2ba6

Please sign in to comment.