From 142b99bfcc599aafcb3bca129c3f3c6b020f96bb Mon Sep 17 00:00:00 2001 From: Smaug123 Date: Sat, 26 Aug 2023 13:27:27 +0100 Subject: [PATCH 1/2] Work around for conditional execution --- .woodpecker/.build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 73f2551..ecc42b9 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -12,5 +12,7 @@ steps: - "pushd RaftFable && nix develop --command npm -- install && popd" - "pushd RaftFable && nix develop --command npm -- run-script build && popd" -when: - evaluate: '(CI_PIPELINE_EVENT == "push" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH) || (CI_PIPELINE_EVENT == "pull_request")' + when: + - event: "push" + evaluate: 'CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' + - event: "pull_request" -- 2.51.0 From 9cac2954d9356b605bdbf20b4e964b183d860d3a Mon Sep 17 00:00:00 2001 From: Smaug123 Date: Sat, 26 Aug 2023 13:28:37 +0100 Subject: [PATCH 2/2] Whitespace --- .woodpecker/.build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index ecc42b9..7cc894c 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -1,16 +1,16 @@ steps: - build: - image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - # Lint - - "nix develop --command bash -c 'dotnet tool restore && ./hooks/pre-push'" - # Test - - nix develop --command dotnet -- test - - nix develop --command dotnet -- test --configuration Release - # Perform build - - "pushd RaftFable && nix develop --command npm -- install && popd" - - "pushd RaftFable && nix develop --command npm -- run-script build && popd" + build: + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + # Lint + - "nix develop --command bash -c 'dotnet tool restore && ./hooks/pre-push'" + # Test + - nix develop --command dotnet -- test + - nix develop --command dotnet -- test --configuration Release + # Perform build + - "pushd RaftFable && nix develop --command npm -- install && popd" + - "pushd RaftFable && nix develop --command npm -- run-script build && popd" when: - event: "push" -- 2.51.0