diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index deaa2137..32c2d45d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: npm install -g npm - npm run version + npm run set:version # Build Controller Image docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/defenseunicorns/pepr/controller:${{ github.ref_name }} . diff --git a/package.json b/package.json index 4c5aaa6a..d9d74a83 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,9 @@ "ci": "npm ci", "gen-data-json": "node hack/build-template-data.js", "prebuild": "rm -fr dist/* && npm run gen-data-json", - "version": "node scripts/set-version.js", "build": "tsc && node build.mjs && npm pack", "build:image": "npm run build && docker buildx build --output type=docker --tag pepr:dev .", + "set:version": "node scripts/set-version.js", "test": "npm run test:unit && npm run test:journey", "test:unit": "npm run gen-data-json && jest src --coverage --detectOpenHandles --coverageDirectory=./coverage --testPathIgnorePatterns='cosign.e2e.test.ts'", "test:integration": "npm run test:integration:prep && npm run test:integration:run", diff --git a/scripts/nightlies.sh b/scripts/nightlies.sh index 4d44ea26..73a37280 100755 --- a/scripts/nightlies.sh +++ b/scripts/nightlies.sh @@ -33,6 +33,6 @@ echo "FULL_VERSION=$FULL_VERSION" >> "$GITHUB_ENV" npm version --no-git-tag-version "$FULL_VERSION" -docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/defenseunicorns/pepr/controller:"$FULL_VERSION" . +docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/defenseunicorns/pepr/controller:v"$FULL_VERSION" . npm publish --tag "nightly"