From a5eb5231cb5bde31968361f409a6e5f6df718c1c Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Fri, 4 Apr 2025 21:03:12 +0100
Subject: [PATCH] Make deployment script accept pat
---
.github/workflows/deployment.yml | 10 +++-------
scripts/generate-renderer.sh | 13 ++++---------
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index d956c016b..705cfed22 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -3,9 +3,6 @@ name: Deploy to EC2
on:
workflow_dispatch:
-env:
- GH_PAT: ${{ secrets.GH_PAT }}
-
jobs:
deploy:
runs-on: ubuntu-latest
@@ -39,11 +36,10 @@ jobs:
pnpm install
- name: Generate Production Build
- env:
- GH_PAT: ${{ secrets.GH_PAT }}
run: |
- git clone https://${{ secrets.GH_PAT }}@github.com/roadmapsh/web-draw.git .temp/web-draw --depth 1
- npm run generate-renderer
+ LATEST_COMMIT_HASH=$(git ls-remote https://${{ secrets.GH_PAT }}@github.com/roadmapsh/web-draw.git refs/heads/main | awk '{print $1}')
+ echo "Using commit hash: $LATEST_COMMIT_HASH"
+ pnpm add "github:roadmapsh/web-draw#${LATEST_COMMIT_HASH}&path:packages/editor"
npm run compress:images
npm run build
diff --git a/scripts/generate-renderer.sh b/scripts/generate-renderer.sh
index 66d75461b..a22270323 100644
--- a/scripts/generate-renderer.sh
+++ b/scripts/generate-renderer.sh
@@ -2,12 +2,7 @@
set -e
-if [ -n "$GH_PAT" ]; then
- LATEST_COMMIT_HASH=$(git ls-remote "https://${GH_PAT}@github.com/roadmapsh/web-draw.git" refs/heads/main | awk '{print $1}')
- echo "Using commit hash: $LATEST_COMMIT_HASH"
- pnpm add "https://${GH_PAT}@github.com/roadmapsh/web-draw#${LATEST_COMMIT_HASH}&path:packages/editor"
-else
- LATEST_COMMIT_HASH=$(git ls-remote git@github.com:roadmapsh/web-draw.git refs/heads/main | awk '{print $1}')
- echo "Using commit hash: $LATEST_COMMIT_HASH"
- pnpm add "github:roadmapsh/web-draw#${LATEST_COMMIT_HASH}&path:packages/editor"
-fi
\ No newline at end of file
+LATEST_COMMIT_HASH=$(git ls-remote git@github.com:roadmapsh/web-draw.git refs/heads/main | awk '{print $1}')
+
+echo "Using commit hash: $LATEST_COMMIT_HASH"
+pnpm add "github:roadmapsh/web-draw#${LATEST_COMMIT_HASH}&path:packages/editor"
\ No newline at end of file