Merge branch 'master' into llvmir

lisa-analyzer · Feb 4, 2024 · f7be255 · f7be255
2 parents 01ffd4b + 8da82fc
commit f7be255
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/.github/workflows/gradle-master.yml b/.github/workflows/gradle-master.yml
@@ -28,29 +28,29 @@ jobs:
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-sdk'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)?$
     - name: 'Delete pre-releases of lisa-program from packages'
       uses: actions/delete-package-versions@v2
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-program'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)?$
     - name: 'Delete pre-releases of lisa-analyses from packages'
       uses: actions/delete-package-versions@v2
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-analyses'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)*$
     - name: 'Delete pre-releases of lisa-imp from packages'
       uses: actions/delete-package-versions@v2
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-imp'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!SNAPSHOT)[a-zA-Z0-9_-]*)*$
     - name: 'Retrieve commit list'
       id: gitinfo
       run: |

diff --git a/.github/workflows/snapshot-branch.yml b/.github/workflows/snapshot-branch.yml
@@ -22,29 +22,45 @@ jobs:
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-sdk'
         min-versions-to-keep: 0 
-        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-branch-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-branch-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)?$
     - name: 'Delete pre-releases of lisa-program from packages'
       uses: actions/delete-package-versions@v2
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-program'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-branch-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-branch-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)?$
     - name: 'Delete pre-releases of lisa-analyses from packages'
       uses: actions/delete-package-versions@v2
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-analyses'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-branch-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-branch-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)?$
     - name: 'Delete pre-releases of lisa-imp from packages'
       uses: actions/delete-package-versions@v2
       with: 
         package-name: 'io.github.lisa-analyzer.lisa-imp'
         min-versions-to-keep: 0
-        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)*$ # this ignores everything that is not version-branch-SNAPSHOT
-        delete-only-pre-release-versions: "true"
+        # this ignores everything that is not version-branch-SNAPSHOT
+        ignore-versions: ^[0-9.b]+(-(?!${{ github.ref_name }}-SNAPSHOT)[a-zA-Z0-9_-]*)?$
+    - name: 'Retrieve version number list'
+      id: gitinfo
+      run: |
+        # get last tag excluding 'latest' and considering only version tags
+        echo "most recent tags:"
+        git tag --sort=-creatordate | head -n5
+        currenttag=$(git tag --sort=-creatordate | grep -v latest | grep "^v[0-9].*" | head -n1)
+        echo "current tag: $currenttag"
+        # tokenize whenever we transition from numbers to whatever else
+        # 5.2b4 -> (5 . 2 b 4)
+        currentver=${currenttag#?} # remove the v
+        echo "current version: $currentver"
+        nexttag=( $(grep -oE '[0-9]+|[^0-9]+' <<< $currentver) ) 
+        let nexttag[-1]=${nexttag[-1]}+1
+        nextver=$(join_by "" "${nexttag[@]}")
+        echo "nextver=$nextver" >> $GITHUB_OUTPUT
     - name: 'Gradle: publish to GitHub Packages'
       env:
         SIGN_PW: ${{ secrets.SIGN_PASSPHRASE }}