From 0985d260c1cd3b70f068ef490caa54cf1f5a157c Mon Sep 17 00:00:00 2001
From: --global <--global>
Date: Wed, 13 Nov 2024 13:12:00 +0000
Subject: [PATCH] undo tmp changes

---
 .github/workflows/backend.yaml  | 6 +++---
 .github/workflows/frontend.yaml | 2 +-
 .github/workflows/release.yaml  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backend.yaml b/.github/workflows/backend.yaml
index 7c528c27..fc74fed5 100644
--- a/.github/workflows/backend.yaml
+++ b/.github/workflows/backend.yaml
@@ -45,8 +45,8 @@ jobs:
     #  - a change is made to the default branch.
     if: |
       github.repository_owner_id == 2088731 &&
-      github.repository_id != 610204172
-    # github.ref_name == github.event.repository.default_branch
+      github.repository_id != 610204172 &&
+      github.ref_name == github.event.repository.default_branch
     steps:
       - name: 🐍 Set up Python ${{ inputs.python-version }} Environment
         uses: ocadotechnology/codeforlife-workspace/.github/actions/python/setup-environment@main
@@ -69,5 +69,5 @@ jobs:
 
   release:
     needs: [build]
-    uses: ocadotechnology/codeforlife-workspace/.github/workflows/release.yaml@contributor-backend-31 # TODO: set to @main
+    uses: ocadotechnology/codeforlife-workspace/.github/workflows/release.yaml@main
     secrets: inherit
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 9fc429e9..62215230 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -56,5 +56,5 @@ jobs:
 
   release:
     needs: [build]
-    uses: ocadotechnology/codeforlife-workspace/.github/workflows/release.yaml@contributor-backend-31 # TODO: set to @main
+    uses: ocadotechnology/codeforlife-workspace/.github/workflows/release.yaml@main
     secrets: inherit
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 229d21fb..31e259f2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -20,8 +20,8 @@ jobs:
     #  - the repo's owner is Ocado Tech.
     #  - a change is made to the default branch.
     if: |
-      github.repository_owner_id == 2088731
-    # github.ref_name == github.event.repository.default_branch
+      github.repository_owner_id == 2088731 &&
+      github.ref_name == github.event.repository.default_branch
     env:
       NODE_VERSION: 22
     steps: