From 047b47fb4607a5e838d976d0c32f261fd972da95 Mon Sep 17 00:00:00 2001 From: "D. Moonfire" Date: Mon, 18 Apr 2022 19:04:23 -0500 Subject: [PATCH] build: cleaning up to fit current standards --- .envrc | 3 +-- .gitlab-ci.yml | 6 +++--- scripts/{ci-build.sh => build.sh} | 0 scripts/{ci-release.sh => release.sh} | 0 scripts/{ci-test.sh => test.sh} | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename scripts/{ci-build.sh => build.sh} (100%) rename scripts/{ci-release.sh => release.sh} (100%) rename scripts/{ci-test.sh => test.sh} (100%) diff --git a/.envrc b/.envrc index 94357ef..3b49f50 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,2 @@ -export PATH=$PWD/node_modules/.bin:$PATH - +export PATH=$PWD/scripts:$PWD/node_modules/.bin:$PATH use flake || use nix diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 151267b..7dedcda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ default: build: stage: build script: - - nix develop --command scripts/ci-build.sh + - nix develop --command scripts/build.sh rules: - if: $CI_COMMIT_BRANCH artifacts: @@ -24,7 +24,7 @@ build: test: stage: test script: - - nix develop --command scripts/ci-test.sh + - nix develop --command scripts/test.sh rules: - if: $CI_COMMIT_BRANCH - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME @@ -32,7 +32,7 @@ test: release: stage: release script: - - nix develop --command scripts/ci-release.sh + - nix develop --command scripts/release.sh rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH artifacts: diff --git a/scripts/ci-build.sh b/scripts/build.sh similarity index 100% rename from scripts/ci-build.sh rename to scripts/build.sh diff --git a/scripts/ci-release.sh b/scripts/release.sh similarity index 100% rename from scripts/ci-release.sh rename to scripts/release.sh diff --git a/scripts/ci-test.sh b/scripts/test.sh similarity index 100% rename from scripts/ci-test.sh rename to scripts/test.sh