fixv5

pulp-platform · Feb 26, 2024 · e175464 · e175464
1 parent 2d90b87
commit e175464
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,7 +16,9 @@ jobs:
     steps:
     -
       name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+      with:
+          fetch-depth: 0
     -
       name: Install Python
       uses: actions/setup-python@v4

diff --git a/util/deploy.py b/util/deploy.py
@@ -21,7 +21,7 @@
 GIT_CHECKOUT_CMD = 'git checkout'
 GIT_CHECKOUT_TAG_CMD = 'git checkout -b'
 GIT_COMMIT_CMD = 'git commit -m'
-GIT_MERGE_SQUASH_CMD = 'git merge --squash --allow-unrelated-histories'
+GIT_MERGE_SQUASH_CMD = 'git merge --squash'
 GIT_PUSH_CMD = 'git push'
 
 # Repo configuration
@@ -76,5 +76,5 @@
 os.popen(f'{GIT_COMMIT_CMD} "{deploy_msg}"')
 time.sleep(0.5)
 
-# push state to origin
-os.popen(f'{GIT_PUSH_CMD} {ORIGIN} {deploy_branch}')
+## push state to origin
+#os.popen(f'{GIT_PUSH_CMD} {ORIGIN} {deploy_branch}')