From eba4d934d8a844236ccad97005ec7ef3f03c95cb Mon Sep 17 00:00:00 2001 From: Julian Weng Date: Sat, 22 Feb 2025 23:13:41 -0500 Subject: [PATCH] Restore frontend check, bump action versions (#785) --- .github/workflows/build-and-deploy.yaml | 28 ++++++++++++++++++------- frontend/bun.lock | 3 ++- frontend/package.json | 1 + 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 4d37ef713..407c5355d 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -8,7 +8,7 @@ on: push jobs: backend-check: name: "Backend Check" - uses: pennlabs/shared-actions/.github/workflows/django.yaml@507f4cf1cc88259fc8625fb3a35bd3f18fc91cd5 + uses: pennlabs/shared-actions/.github/workflows/django.yaml@v0.1.5 secrets: inherit with: projectName: pennclubs @@ -18,15 +18,28 @@ jobs: black: false ruff: true + frontend-check: + name: "Frontend Check" + uses: pennlabs/shared-actions/.github/workflows/react.yaml@v0.1.5 + secrets: inherit + with: + path: frontend + imageName: pennlabs/penn-clubs-frontend # inputs are required for build purposes but are not used for check + githubRef: ${{ github.ref }} + gitSha: ${{ github.sha }} + nodeVersion: 20.11.1 + skipReactPublish: true + skipCodecov: true + build-backend: name: Build backend runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: buildx-build-backend @@ -50,11 +63,11 @@ jobs: name: Build frontend runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: docker/setup-qemu-action@v1 - uses: docker/setup-buildx-action@v1 - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: buildx-build-frontend @@ -72,13 +85,14 @@ jobs: with: name: build-frontend path: /tmp/image.tar + needs: frontend-check publish: name: Publish Images runs-on: ubuntu-latest if: github.ref == 'refs/heads/master' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 - uses: geekyeggo/delete-artifact@v5 with: @@ -103,7 +117,7 @@ jobs: deploy: name: "Deploy" - uses: pennlabs/shared-actions/.github/workflows/deployment.yaml@v0.1.3-patch.1 + uses: pennlabs/shared-actions/.github/workflows/deployment.yaml@v0.1.5 with: githubRef: ${{ github.ref }} diff --git a/frontend/bun.lock b/frontend/bun.lock index e8edca4b3..cbd4e688a 100644 --- a/frontend/bun.lock +++ b/frontend/bun.lock @@ -99,6 +99,7 @@ "nyc": "^15.1.0", "prettier": "^3.5.1", "swc-plugin-coverage-instrument": "^0.0.25", + "typescript": "5.5.4", "wait-on": "^7.2.0", }, }, @@ -2416,7 +2417,7 @@ "typedarray-to-buffer": ["typedarray-to-buffer@3.1.5", "", { "dependencies": { "is-typedarray": "^1.0.0" } }, "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="], - "typescript": ["typescript@5.7.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw=="], + "typescript": ["typescript@5.5.4", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q=="], "ua-parser-js": ["ua-parser-js@0.7.40", "", { "bin": { "ua-parser-js": "script/cli.js" } }, "sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ=="], diff --git a/frontend/package.json b/frontend/package.json index 86e00e5f0..072128e05 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -110,6 +110,7 @@ "nyc": "^15.1.0", "prettier": "^3.5.1", "swc-plugin-coverage-instrument": "^0.0.25", + "typescript": "5.5.4", "wait-on": "^7.2.0" }, "engines": {