From 9f5ccc157989f4411467fc1c1b7a4532681bff2b Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Fri, 31 May 2024 22:25:54 +0100 Subject: [PATCH 1/2] Fix pipeline --- .editorconfig | 1 - .woodpecker/.build.yml | 49 +++++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9ef5fed..e207c42 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,6 @@ root=true [*] charset=utf-8 -end_of_line=crlf trim_trailing_whitespace=true insert_final_newline=true indent_style=space diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 0983b09..45fae8e 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -1,22 +1,27 @@ -steps: - build: - image: nixos/nix - commands: - - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - # Lint - - "nix flake check" - # Test - - nix build - - nix run . -- --help - - nix run . -- auth --help - - nix run . -- lookup-gym --help - - nix run . -- fullness --help - - nix run . -- activity --help - - nix develop --command markdown-link-check README.md - - nix develop --command dotnet test - - nix develop --command dotnet test --configuration Release - - when: - - event: "push" - evaluate: 'CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' - - event: "pull_request" +# yaml-language-server: $schema=https://raw.githubusercontent.com/woodpecker-ci/woodpecker/main/pipeline/frontend/yaml/linter/schema/schema.json +{ + "steps": { + "build": { + "image": "nixos/nix", + "commands": [ + "echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf", + # Lint + "nix flake check", + # Test + "- nix build", + "- nix run . -- --help", + "- nix run . -- auth --help", + "- nix run . -- lookup-gym --help", + "- nix run . -- fullness --help", + "- nix run . -- activity --help", + "- nix develop --command markdown-link-check README.md", + "- nix develop --command dotnet test", + "- nix develop --command dotnet test --configuration Release" + ], + "when": [ + { "event": "push", "evaluate": "CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH" }, + { "event": "pull_request" } + ] + } + } +} -- 2.51.0 From 4fcc415da8daf94fc64381218a75f9048d952dea Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Fri, 31 May 2024 23:41:59 +0100 Subject: [PATCH 2/2] Fix pipeline --- .woodpecker/.build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 45fae8e..36ed4ec 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -8,15 +8,15 @@ # Lint "nix flake check", # Test - "- nix build", - "- nix run . -- --help", - "- nix run . -- auth --help", - "- nix run . -- lookup-gym --help", - "- nix run . -- fullness --help", - "- nix run . -- activity --help", - "- nix develop --command markdown-link-check README.md", - "- nix develop --command dotnet test", - "- nix develop --command dotnet test --configuration Release" + "nix build", + "nix run . -- --help", + "nix run . -- auth --help", + "nix run . -- lookup-gym --help", + "nix run . -- fullness --help", + "nix run . -- activity --help", + "nix develop --command markdown-link-check README.md", + "nix develop --command dotnet test", + "nix develop --command dotnet test --configuration Release" ], "when": [ { "event": "push", "evaluate": "CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH" }, -- 2.51.0