@jakubmazanec/carson-templates 2.0.0-next.75b0d46 → 2.0.0-next.9befaf5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jakubmazanec/carson-templates",
-  "version": "2.0.0-next.75b0d46",
+  "version": "2.0.0-next.9befaf5",
   "description": "Collection of Carson templates.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "semver": "^7.3.6"
   },
   "devDependencies": {
-    "@jakubmazanec/carson": "0.3.0-next.75b0d46",
+    "@jakubmazanec/carson": "0.3.0-next.9befaf5",
     "@jakubmazanec/fs-utils": "^0.1.0",
     "@jest/globals": "^29.5.0",
     "@types/fs-extra": "^9.0.13",
@@ -45,7 +45,7 @@
     "zen-observable": "^0.10.0"
   },
   "peerDependencies": {
-    "@jakubmazanec/carson": "0.3.0-next.75b0d46"
+    "@jakubmazanec/carson": "0.3.0-next.9befaf5"
   },
   "packageManager": "npm@8.19.4",
   "engines": {

package/templates/workspace/.github/workflows/pull-request.yaml.ejs

@@ -12,12 +12,13 @@ on:
 jobs:
   check_pull_request:
     name: Check pull request
+    if: ${{ github.actor != 'renovate[bot]' }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
         with:
-          token: ${{secrets.GITHUB_TOKEN}}
+          token: ${{secrets.PAT}}
           fetch-depth: 0
 
       - name: Configure git
@@ -33,7 +34,6 @@ jobs:
         run: npm ci
 
       - name: Check for changes
-        if: "github.actor != 'renovate[bot]'"
         run: |
           git config core.filemode false
           git_status=$(git status --porcelain)
@@ -51,7 +51,6 @@ jobs:
         run: npm test
 
       - name: Check for changes
-        if: "github.actor != 'renovate[bot]'"
         run: |
           git config core.filemode false
           git_status=$(git status --porcelain)

package/templates/workspace/.github/workflows/release.yaml.ejs

@@ -9,9 +9,9 @@ on: [push, workflow_dispatch]
 jobs:
   release_main_branch:
     name: Main branch release
+    if: ${{ github.ref_name == '<%- getMainBranch(workspace) %>' }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    if: "github.ref_name == '<%- getMainBranch(workspace) %>'"
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.11.0
@@ -133,9 +133,9 @@ jobs:
 
   release_development_branch:
     name: Development branch release
+    if: ${{ github.ref_name == '<%- getDevelopmentBranch(workspace) %>' }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    if: "github.ref_name == '<%- getDevelopmentBranch(workspace) %>'"
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.11.0
@@ -228,7 +228,7 @@ jobs:
     name: Feature branch release
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    if: "github.ref_name != '<%- getMainBranch(workspace) %>' && github.ref_name != '<%- getDevelopmentBranch(workspace) %>' && github.actor != 'renovate[bot]'"
+    if: ${{ github.ref_name != '<%- getMainBranch(workspace) %>' && github.ref_name != '<%- getDevelopmentBranch(workspace) %>' && github.actor != 'renovate[bot]' }}
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@0.11.0

package/templates/workspace/.github/workflows/update-pull-request.yaml.ejs

@@ -6,20 +6,19 @@ name: Update pull request
 
 on:
   pull_request_target:
-    branches:
-      - development
+    branches: [development]
 
 jobs:
   update_pull_request:
     name: Update pull request
-    if: github.actor == 'renovate[bot]'
+    if: ${{ github.actor == 'renovate[bot]' && contains(github.head_ref, 'renovate/') }}
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
-          token: ${{secrets.GITHUB_TOKEN}}
+          token: ${{secrets.PAT}}
           fetch-depth: 0
 
       - name: Configure git
@@ -36,7 +35,6 @@ jobs:
 
       - name: Generate changeset
         uses: actions/github-script@v6
-        if: ${{ github.actor == 'renovate[bot]' }}
         with:
           script: |
             let { promises: fs } = require('fs');
@@ -60,9 +58,11 @@ jobs:
 
               for (let [packageName, bump] of packageBumps) {
                 message =
-                  message + `Dependency \`${packageName}\` updated to \`${bump}\`.\n`;
+                  message + `Dependency \`${packageName}\` updated to version \`${bump}\`.\n`;
               }
 
+              message = message.replace('\n', ' ');
+
               let header = packages
                 .map((packageName) => `'${packageName}': patch`)
                 .join('\n');
@@ -108,9 +108,6 @@ jobs:
               console.log('No package.json changes to published packages, skipping...');
 
               await exec.exec('npx', ['changeset', '--empty']);
-              await exec.exec('git', ['add', '.', '--all']);
-              await exec.exec('git commit -m"Add changeset [skip actions]"');
-              await exec.exec('git push --force');
 
               return;
             }
@@ -122,14 +119,13 @@ jobs:
             let packageBumps = await getBumps(files);
 
             await createChangeset(fileName, packageBumps, packageNames);
-            await exec.exec('git', ['add', '.', '--all']);
-            await exec.exec('git commit -m"Add changeset [skip actions]"');
-            await exec.exec('git push --force');
 
       - name: Update Carson
-        if: ${{ github.actor == 'renovate[bot]' }}
         run: |
           npm install
+
+      - name: Commit and push changes
+        run: |
           git add . --all
-          git commit -m"Run Carson update [skip actions]"
+          git commit -m"Update"
           git push --force