Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create PR from patch for prod deployment version fixes #4299

Closed
NoopDog opened this issue Dec 3, 2024 · 0 comments · Fixed by #4300
Closed

Create PR from patch for prod deployment version fixes #4299

NoopDog opened this issue Dec 3, 2024 · 0 comments · Fixed by #4300
Assignees
Labels
canary Done by the Clever Canary team

Comments

@NoopDog
Copy link
Collaborator

NoopDog commented Dec 3, 2024

Please create a PR from the patch below.

Subject: [PATCH] drop! Preview site first
---
Index: .gitlab/ci.yaml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.gitlab/ci.yaml b/.gitlab/ci.yaml
--- a/.gitlab/ci.yaml	(revision ff8c4bc4451e1ca71276a19e877db25dafc02257)
+++ b/.gitlab/ci.yaml	(date 1732174236430)
@@ -1,3 +1,7 @@
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH =~ /^ucsc\//
+
 stages:
   - build_image
   - generate_child_yaml
@@ -7,12 +11,7 @@
   DOCKER_IMAGE: $CI_REGISTRY_IMAGE
   DOCKER_TAG: $CI_PIPELINE_ID
 
-.on_branch_push:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH
-
 build_image:
-  extends: .on_branch_push
   stage: build_image
   rules:
     - if: $CI_COMMIT_BRANCH
@@ -23,7 +22,6 @@
     - docker push $DOCKER_IMAGE:$DOCKER_TAG
 
 generate_child_yaml:
-  extends: .on_branch_push
   stage: generate_child_yaml
   image: $DOCKER_IMAGE:$DOCKER_TAG
   script:
Index: scripts/set-version.sh
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/scripts/set-version.sh b/scripts/set-version.sh
--- a/scripts/set-version.sh	(revision ff8c4bc4451e1ca71276a19e877db25dafc02257)
+++ b/scripts/set-version.sh	(date 1732174236431)
@@ -13,7 +13,7 @@
 BUILD_DATE=$(TZ="America/Los_Angeles" date +"%Y-%m-%d %H:%M:%S %Z")
 
 # Get the current code version from git
-VERSION=$(git tag --points-at HEAD)
+VERSION=$(git describe --tags | cut -d- -f1)
 
 # Append newline to ensure following lines are separated from existing content
 echo "" >> "$TARGET_ENV_FILE"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
canary Done by the Clever Canary team
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants