From 579c3e2e513b5614628833319b1d8cbd89278425 Mon Sep 17 00:00:00 2001
From: Kashiwa <13825170+ksw2000@users.noreply.github.com>
Date: Mon, 25 Nov 2024 17:29:10 +0800
Subject: [PATCH] fix: reorder lint and fix commit and push

---
 .github/workflows/cd.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 2be048a..e4d9e48 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -12,20 +12,20 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 20
+      - name: lint
+        run: npm run lint
       - name: build
         run: |
           npm ci
           npx ng add angular-cli-ghpages --skip-confirmation
           npx ng build --base-href=/${{ github.event.repository.name }}/
-      - name: lint
-        run: npm run lint
       - name: commit and push
         run: |
           cd dist/dev-fest-2024/browser
           git init
           git config user.name  "build-ci"
           git config user.email "build-ci@github.com"
-          git remote add secure-origin https://${{ secrets.GENERAL_CI }}@github.com/ksw2000/${{ github.event.repository.name }}
+          git remote add secure-origin https://${{ secrets.GITHUB_TOKEN }}@github.com/gdg-twhk/${{ github.event.repository.name }}
           git checkout -b gh-pages
           git add .
           git commit -m "gitpage by CI"
@@ -37,13 +37,13 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20
+      - name: lint
+        run: npm run lint
       - name: build
         run: |
           npm ci
           npx ng add angular-cli-ghpages --skip-confirmation
           npx ng build --base-href=/2024/
-      - name: lint
-        run: npm run lint
       - name: Deploy to Firebase Hosting
         uses: FirebaseExtended/action-hosting-deploy@v0
         with:
@@ -51,4 +51,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT }}"
           projectId: "${{ secrets.PROJECT_ID }}"
-          channelId: live
\ No newline at end of file
+          channelId: live