diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-01-27 17:36:27 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-01-27 17:36:27 +0000 |
| commit | 5e3e1f4453dacc814c79bbec08cd5acadb2ce4d0 (patch) | |
| tree | 16b7adb0ebc13477bf68014c3d70be1833541fd5 | |
| parent | 0156e40c9d8015b81f80f12f058564288fdb304c (diff) | |
| parent | bb3e0f7d22eae49842dd61d0ee6463222aa1a5ea (diff) | |
| download | garage-5e3e1f4453dacc814c79bbec08cd5acadb2ce4d0.tar.gz garage-5e3e1f4453dacc814c79bbec08cd5acadb2ce4d0.zip | |
Merge pull request 'fix problems with CI doing work multiple times' (#936) from woodpecker-simplify into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/936
| -rw-r--r-- | .woodpecker/debug.yaml | 3 | ||||
| -rw-r--r-- | .woodpecker/release.yaml | 1 | ||||
| -rw-r--r-- | nix/compile.nix | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.woodpecker/debug.yaml b/.woodpecker/debug.yaml index 06597a3b..db7a75be 100644 --- a/.woodpecker/debug.yaml +++ b/.woodpecker/debug.yaml @@ -24,8 +24,7 @@ steps: GARAGE_TEST_INTEGRATION_EXE: result-bin/bin/garage GARAGE_TEST_INTEGRATION_PATH: tmp-garage-integration commands: - - nix-build --no-build-output --attr pkgs.amd64.debug --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA} - - nix-build --no-build-output --attr test.amd64 + - nix-build --no-build-output --attr test.amd64 --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA} - ./result/bin/garage_db-* - ./result/bin/garage_api-* - ./result/bin/garage_model-* diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 3f4a40a0..a2328d5e 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -23,7 +23,6 @@ steps: - name: check is static binary image: nixpkgs/nix:nixos-22.05 commands: - - nix-build --no-build-output --attr pkgs.${ARCH}.release --argstr git_version ${CI_COMMIT_TAG:-$CI_COMMIT_SHA} - nix-shell --attr ci --run "./script/not-dynamic.sh result-bin/bin/garage" - name: integration tests diff --git a/nix/compile.nix b/nix/compile.nix index 2755f5be..9630b5dd 100644 --- a/nix/compile.nix +++ b/nix/compile.nix @@ -134,4 +134,5 @@ let in pkgs.rustBuilder.makePackageSet ({ inherit release packageFun packageOverrides codegenOpts rootFeatures; target = rustTarget; + workspaceSrc = pkgs.lib.cleanSource ../.; } // toolchainOptions) |