diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 32b16206b2..3a78116993 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -17,24 +17,13 @@ jobs: - name: Pull musl run: | git submodule update --init lib/musl - - name: Restore LLVM source cache - uses: actions/cache/restore@v4 - id: cache-llvm-source - with: - key: llvm-source-18-linux-nix-v1 - path: | - llvm-project/compiler-rt - name: Download LLVM source - if: steps.cache-llvm-source.outputs.cache-hit != 'true' run: make llvm-source - - name: Save LLVM source cache - uses: actions/cache/save@v4 - if: steps.cache-llvm-source.outputs.cache-hit != 'true' - with: - key: ${{ steps.cache-llvm-source.outputs.cache-primary-key }} - path: | - llvm-project/compiler-rt - uses: cachix/install-nix-action@v22 - - name: Test + - name: Build run: | - nix develop --ignore-environment --keep HOME --command bash -c "go install && ~/go/bin/tinygo version && ~/go/bin/tinygo build -o test ./testdata/cgo" + nix develop --ignore-environment --keep HOME --command bash -c "go build ." + - uses: cachix/install-nix-action@v22 + with: + name: upload + path: "/home/runner/go/bin/tinygo" diff --git a/flake.nix b/flake.nix index 25ffc70205..63cb551a1f 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ export MD5SUM=md5sum # Ugly hack to make the Clang resources directory available. - export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_18.clang.cc.lib}/lib/clang/18\" -tags=llvm18" + #export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_18.clang.cc.lib}/lib/clang/18\" -tags=llvm18" ''; }; }