fixing some actions (#903)

AgnostiqHQ · Jul 26, 2022 · ffadb62 · ffadb62
1 parent 0bfe136
commit ffadb62
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 26 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -25,8 +25,7 @@ on:
   push:
     branches:
       - develop
-    paths-ignore:
-      - "CHANGELOG.md"
+    paths:
       - "VERSION"
   workflow_dispatch:
     inputs:

diff --git a/.github/workflows/hotfix.yml b/.github/workflows/hotfix.yml
@@ -125,7 +125,7 @@ jobs:
           terminal_commit=1
           IFS='-' read -ra describe_tag <<< "$latest_tag"
           if [[ ${#describe_tag[1]} -gt 0 ]] ; then
-            version="${describe_tag[1]}-$((${describe_tag[1]}+1))"
+            version="${describe_tag[0]}-$((${describe_tag[1]}+1))"
           else
             version="${describe_tag[0]}-1"
           fi
@@ -150,7 +150,6 @@ jobs:
           git checkout -b "hotfix-$VERSION"
           IFS=',' read -ra commit_shas <<< "${{ github.event.inputs.commit_shas }}"
           git cherry-pick -X ours ${commit_shas[@]}
-          git reset --soft "v${{ github.event.inputs.stable_version }}"
           git remote set-url origin https://${{ secrets.COVALENT_OPS_BOT_TOKEN }}@github.com/AgnostiqHQ/covalent.git
           git push -u origin "hotfix-$VERSION"
       - name: Increment version

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -28,26 +28,29 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      uses: actions/stale@v5
-      with:
-        repo-token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }}
-        days-before-pr-stale: 3
-        days-before-pr-close: 2
-        stale-pr-message: 'This pull request is stale because it has been in review for at least three days. It will be closed in two more days.'
-        close-pr-message: 'This pull request was closed because it has been in review for at least five days. Consider breaking up your code into smaller changes to facilitate faster reviews.'
-        ignore-pr-updates: true
-        except-draft-pr: true
-        exempt-pr-labels: 'stale-exempt'
-        days-before-issue-stale: -1
-        days-before-issue-close: -1
+      - name: Stale PRs in review
+        uses: actions/stale@v5
+        with:
+          repo-token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }}
+          days-before-pr-stale: 3
+          days-before-pr-close: 2
+          stale-pr-message: 'This pull request is stale because it has been in review for at least three days. It will be closed in two more days.'
+          close-pr-message: 'This pull request was closed because it has been in review for at least five days. Consider breaking up your code into smaller changes to facilitate faster reviews.'
+          ignore-pr-updates: true
+          except-draft-pr: true
+          exempt-pr-labels: 'stale-exempt'
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
 
-      uses: actions/stale@v5
-        repo-token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }}
-        days-before-pr-stale: 15
-        days-before-pr-close: 5
-        stale-pr-message: 'This pull request is stale because it has been open for at least 15 days. It will be closed in five more days.'
-        close-pr-message: 'This pull request was closed because it has been open for at least 20 days.'
-        ignore-pr-updates: true
-        exempt-pr-labels: 'stale-exempt'
-        days-before-issue-stale: -1
-        days-before-issue-close: -1
+      - name: Stale PRs in any state
+        uses: actions/stale@v5
+        with:
+          repo-token: ${{ secrets.COVALENT_OPS_BOT_TOKEN }}
+          days-before-pr-stale: 15
+          days-before-pr-close: 5
+          stale-pr-message: 'This pull request is stale because it has been open for at least 15 days. It will be closed in five more days.'
+          close-pr-message: 'This pull request was closed because it has been open for at least 20 days.'
+          ignore-pr-updates: true
+          exempt-pr-labels: 'stale-exempt'
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Operations
 
+- Fixed syntax errors in `stale.yml` and in `hotfix.yml`
+- `docker.yml` triggered after version bump in `develop` instead of before
 - Enhanced `tests.yml` to upload coverage reports by domain
 
 ## [0.155.0] - 2022-07-26