Compare commits

..

1 Commits

Author SHA1 Message Date
Flea Flicker 11ab6d1294 fix(ci): update kustomize image refs from ghcr.io to git.farh.net
CI / lint (pull_request) Has been cancelled
CI / test (pull_request) Has been cancelled
CI / audit (pull_request) Has been cancelled
CI / e2e (pull_request) Has been cancelled
CI / lighthouse (pull_request) Has been cancelled
CI / build-and-push (pull_request) Has been cancelled
CI / deploy-dev (pull_request) Has been cancelled
CI / deploy-uat (pull_request) Has been cancelled
Fixes QA finding: deploy-dev and deploy-uat jobs still referenced ghcr.io
in kustomize edit set image commands.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-23 15:53:37 +00:00
4 changed files with 964 additions and 913 deletions
@@ -21,10 +21,10 @@ env:
jobs:
lint:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
@@ -35,10 +35,10 @@ jobs:
run: npx tsc --noEmit
test:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
@@ -47,10 +47,10 @@ jobs:
run: npx vitest run
audit:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
@@ -59,10 +59,10 @@ jobs:
run: npm audit --audit-level=high
e2e:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
@@ -71,11 +71,11 @@ jobs:
- run: npx playwright test
lighthouse:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
needs: [test]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: npm
@@ -87,17 +87,8 @@ jobs:
npx playwright install --with-deps chromium
- name: Start preview server
run: |
npm run preview -- --port 4173 &
for i in $(seq 1 30); do
if curl -s http://localhost:4173/ > /dev/null 2>&1; then
echo "Server ready on http://localhost:4173/"
exit 0
fi
echo "Waiting for server... ($i/30)"
sleep 2
done
echo "Server failed to start"
exit 1
npm run preview &
npx wait-on http://localhost:4173/ --timeout 30000
- name: Run Lighthouse CI
run: |
CHROME_PATH=$(find /home/runner/.cache/ms-playwright -name chrome -type f 2>/dev/null | head -1)
@@ -105,7 +96,7 @@ jobs:
CHROME_PATH="$CHROME_PATH" lhci autorun --chrome-flags="--headless=new --no-sandbox --disable-gpu --disable-dev-shm-usage"
build-and-push:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
if: github.event_name == 'push'
needs: [lint, test, e2e]
outputs:
@@ -181,7 +172,11 @@ jobs:
only-fixed: "true"
output-format: sarif
- name: Upload frontend scan results to GitHub Security
uses: github/codeql-action/upload-sarif@v3
if: always()
with:
sarif_file: ${{ steps.scan.outputs.sarif }}
- name: Push Docker image
if: github.event_name == 'push'
@@ -201,15 +196,24 @@ jobs:
git push origin "v${{ steps.calver.outputs.version }}"
deploy-dev:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
needs: [build-and-push]
if: always() && !cancelled() && github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.CARTSNITCH_APP_ID }}
private-key: ${{ secrets.CARTSNITCH_APP_PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
repositories: infra
- name: Checkout infra repo
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.GITEA_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
ref: main
path: infra
@@ -232,7 +236,7 @@ jobs:
if: needs.build-and-push.result == 'success'
run: |
cd infra/apps/overlays/dev
kustomize edit set image ghcr.io/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }}
kustomize edit set image git.farh.net/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }}
- name: Commit and push to infra
run: |
@@ -245,15 +249,24 @@ jobs:
git push origin main
deploy-uat:
runs-on: ubuntu-latest
runs-on: runners-cartsnitch
needs: [build-and-push]
if: always() && !cancelled() && github.event_name == 'push' && (github.ref == 'refs/heads/uat' || github.ref == 'refs/heads/main')
steps:
- name: Generate GitHub App token
id: app-token
uses: actions/create-github-app-token@v1
with:
app-id: ${{ secrets.CARTSNITCH_APP_ID }}
private-key: ${{ secrets.CARTSNITCH_APP_PRIVATE_KEY }}
owner: ${{ github.repository_owner }}
repositories: infra
- name: Checkout infra repo
uses: actions/checkout@v4
with:
repository: cartsnitch/infra
token: ${{ secrets.GITEA_TOKEN }}
token: ${{ steps.app-token.outputs.token }}
ref: main
path: infra
@@ -276,7 +289,7 @@ jobs:
if: needs.build-and-push.result == 'success'
run: |
cd infra/apps/overlays/uat
kustomize edit set image ghcr.io/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }}
kustomize edit set image git.farh.net/cartsnitch/app:${{ steps.frontend_tag.outputs.tag }}
- name: Commit and push to infra
run: |
+920 -880
View File
File diff suppressed because it is too large Load Diff
+1 -3
View File
@@ -48,12 +48,10 @@
"vitest": "^3.2.4"
},
"overrides": {
"@babel/plugin-transform-modules-systemjs": ">=7.29.4",
"@rollup/pluginutils": "5.3.0",
"brace-expansion": ">=1.1.15",
"fast-uri": ">=3.1.2",
"flatted": "^3.4.2",
"serialize-javascript": "7.0.5",
"brace-expansion": ">=1.1.13",
"lodash": ">=4.17.24",
"minimatch": "^10.2.4"
}
+1 -1
View File
@@ -16,7 +16,7 @@ export function VerifyEmail() {
const callbackURL = searchParams.get("callbackURL") || "/";
if (!token) {
queueMicrotask(() => setStatus("error"));
setStatus("error");
return;
}