Merge branch 'master' into feat/configure-stack

linz · Sep 25, 2023 · f3a7022 · f3a7022
2 parents edd3c1c + 75704c3
commit f3a7022
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -19,7 +19,7 @@ jobs:
         uses: linz/action-typescript@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          registry-url: 'https://npm.pkg.github.com'
+          registry-url: https://npm.pkg.github.com
         env:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
@@ -64,21 +64,18 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: https://npm.pkg.github.com/
-          scope: '@linz'
           cache: npm
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Install production Node.js packages
         run: npm ci --omit=dev
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Configure AWS Credentials
-        if: github.repository == 'linz/hydro-aws-infrastructure'
         uses: aws-actions/configure-aws-credentials@v4.0.0
         with:
           aws-region: ap-southeast-2
           role-to-assume: ${{ github.ref == 'refs/heads/master' && 'arn:aws:iam::434775598764:role/ContinuousIntegration-GitHubActionsRole4F1BBA26-U1I7SY11QA7D' || 'arn:aws:iam::623931144233:role/ContinuousIntegration-GitHubActionsRole4F1BBA26-WDE0O3ZN93A6' }}
 
       - name: Deploy
-        if: github.repository == 'linz/hydro-aws-infrastructure'
-        run: npm run cdk deploy --  --method=direct --require-approval=never --role-arn=${{ github.ref == 'refs/heads/master' && 'arn:aws:iam::434775598764:role/ContinuousIntegration-CiExecRoleAA6BFF70-1SL2099R0R4A2' || 'arn:aws:iam::623931144233:role/ContinuousIntegration-CiExecRoleAA6BFF70-CTEJ6J3L1NVU' }} --strict --verbose
+        run: npm run cdk deploy -- --method=direct --require-approval=never --role-arn=${{ github.ref == 'refs/heads/master' && 'arn:aws:iam::434775598764:role/ContinuousIntegration-CiExecRoleAA6BFF70-1SL2099R0R4A2' || 'arn:aws:iam::623931144233:role/ContinuousIntegration-CiExecRoleAA6BFF70-CTEJ6J3L1NVU' }} --strict --verbose
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@linzjs/style": "^5.0.0",
-    "@types/node": "^20.6.3",
+    "@types/node": "^20.6.5",
     "aws-cdk": "2.97.0",
     "aws-cdk-lib": "2.96.2",
     "constructs": "^10.0.0",