fix(ci): all version bump changes go in the PR (argoproj#21409)

* chore(ci): fix version bump codegen Signed-off-by: Michael Crenshaw <[email protected]> * link, not copy Signed-off-by: Michael Crenshaw <[email protected]> * make directory Signed-off-by: Michael Crenshaw <[email protected]> * maybe backwards Signed-off-by: Michael Crenshaw <[email protected]> * what's up Signed-off-by: Michael Crenshaw <[email protected]> * what's up Signed-off-by: Michael Crenshaw <[email protected]> * what's up Signed-off-by: Michael Crenshaw <[email protected]> * I give up Signed-off-by: Michael Crenshaw <[email protected]> * remove silliness Signed-off-by: Michael Crenshaw <[email protected]> * somehow Signed-off-by: Michael Crenshaw <[email protected]> * frustration Signed-off-by: Michael Crenshaw <[email protected]> * who knows Signed-off-by: Michael Crenshaw <[email protected]> * oops Signed-off-by: Michael Crenshaw <[email protected]> --------- Signed-off-by: Michael Crenshaw <[email protected]>
reggie-k · Jan 7, 2025 · 06bd2ad · 06bd2ad
1 parent 05c7625
commit 06bd2ad
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/.github/workflows/bump-major-version.yaml b/.github/workflows/bump-major-version.yaml
@@ -26,18 +26,20 @@ jobs:
           CURRENT_VERSION=$(grep 'module github.com/argoproj/argo-cd' go.mod | awk '{print $2}' | sed 's/.*\/v//')
           echo "TARGET_VERSION=$((CURRENT_VERSION + 1))" >> $GITHUB_OUTPUT
 
+      - name: Copy source code to GOPATH
+        run: |
+          mkdir -p ~/go/src/github.com/argoproj
+          cp -a ../argo-cd ~/go/src/github.com/argoproj
+
       - name: Run script to bump the version
         run: |
           hack/bump-major-version.sh
+        working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
 
       - name: Setup Golang
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
-      - name: Create symlink in GOPATH
-        run: |
-          mkdir -p ~/go/src/github.com/argoproj
-          cp -a ../argo-cd ~/go/src/github.com/argoproj
       - name: Add ~/go/bin to PATH
         run: |
           echo "/home/runner/go/bin" >> $GITHUB_PATH
@@ -66,6 +68,11 @@ jobs:
           make codegen-local
         working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
 
+      - name: Copy changes back
+        run: |
+          # Copy the contents back, but skip the .git directory
+          rsync -a --exclude=.git /home/runner/go/src/github.com/argoproj/argo-cd/ ../argo-cd
+
       - name: Create pull request
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f  # v7.0.5
         with:
@@ -79,4 +86,4 @@ jobs:
             - [ ] Add an upgrade guide to the docs for this version
           branch: bump-major-version
           branch-suffix: random
-          signoff: true
+          signoff: true