Don't use dynamic branch for ref check

3lvia · Aug 19, 2024 · 382085f · 382085f
1 parent 8a54ab6
commit 382085f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/.github/workflows/example-build-deploy-dotnet-google.yml b/.github/workflows/example-build-deploy-dotnet-google.yml
@@ -83,8 +83,8 @@ jobs:
       contents: read
       id-token: write
     environment: dev
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -106,8 +106,8 @@ jobs:
       contents: read
       id-token: write
     environment: test
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -129,8 +129,8 @@ jobs:
       contents: read
       id-token: write
     environment: prod
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:

diff --git a/.github/workflows/example-build-deploy-dotnet.yml b/.github/workflows/example-build-deploy-dotnet.yml
@@ -83,8 +83,8 @@ jobs:
       contents: read
       id-token: write
     environment: dev
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -104,8 +104,8 @@ jobs:
       contents: read
       id-token: write
     environment: test
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:

diff --git a/.github/workflows/example-build-deploy-go-google.yml b/.github/workflows/example-build-deploy-go-google.yml
@@ -54,8 +54,8 @@ jobs:
       contents: read
       id-token: write
     environment: dev
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -77,8 +77,8 @@ jobs:
       contents: read
       id-token: write
     environment: test
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -100,8 +100,8 @@ jobs:
       contents: read
       id-token: write
     environment: prod
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:

diff --git a/.github/workflows/example-build-deploy-go.yml b/.github/workflows/example-build-deploy-go.yml
@@ -54,8 +54,8 @@ jobs:
       contents: read
       id-token: write
     environment: dev
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -75,8 +75,8 @@ jobs:
       contents: read
       id-token: write
     environment: test
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:
@@ -96,8 +96,8 @@ jobs:
       contents: read
       id-token: write
     environment: prod
-    # Only on push to $default-branch
-    if: github.ref_name == "trunk"
+    # Only on push to trunk
+    if: github.ref == 'refs/heads/trunk'
     steps:
       - uses: 3lvia/core-github-actions-templates/deploy@trunk
         with:

diff --git a/.github/workflows/update-starter-workflows.yml b/.github/workflows/update-starter-workflows.yml
@@ -65,10 +65,8 @@ jobs:
             sed -i "s/  SYSTEM_NAME: 'core'/  SYSTEM_NAME: '<your system name here>'/g" "$new_workflow_path"
             sed -i "s/  HELM_VALUES_PATH: '.*'/  HELM_VALUES_PATH: '.github\/deploy\/values.yml'/g" "$new_workflow_path"
             sed -i "s/  PROJECT_FILE: '.*'/  PROJECT_FILE: '<your project file path here>'/g" "$new_workflow_path"
-            sed -i 's/github.ref_name == "trunk"/github.ref_name == $default-branch/g' "$new_workflow_path"
             sed -i "s/# pull_request:/  pull_request:/g" "$new_workflow_path"
-            sed -i "s/#   branches: \[trunk\]/    branches: \[trunk\]/g" "$new_workflow_path"
-            sed -i 's/branches: \[trunk\]/branches: \[$default-branch\]/g' "$new_workflow_path"
+            sed -i 's/#   branches: \[trunk\]/    branches: \[$default-branch\]/g' "$new_workflow_path"
 
             new_workflow_properties_file="dotgithub/workflow-templates/${file_name_no_prefix%.yml}.properties.json"
             if [ ! -f "$new_workflow_properties_file" ]; then