Remove MSYS2 packages from release artifacts

nickg · Feb 2, 2025 · 058d1d4 · 058d1d4
1 parent f8984e7
commit 058d1d4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 58 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.ref_name != 'master' }}
 
 jobs:
   build-ubuntu:
@@ -191,11 +191,6 @@ jobs:
         run: nvc --install osvvm
       - name: Install UVVM
         run: nvc --install uvvm
-      - name: 'Upload artifact'
-        uses: actions/upload-artifact@v4
-        with:
-          name: 'MSYS2 mingw64 package'
-          path: contrib/msys2/${{ env.MSYS2_PKG }}
 
   build-package:
     name: Build package

diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml
@@ -7,56 +7,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  pkg-windows-msys2:
-    name: Package for Windows MSYS2
-    runs-on: windows-2022
-    strategy:
-      matrix:
-        include:
-          - { sys: mingw64, env: x86_64 }
-          - { sys: ucrt64,  env: ucrt-x86_64 }
-          - { sys: clang64, env: clang-x86_64 }
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{matrix.sys}}
-          update: true
-          install: >-
-            base-devel
-            git
-            mingw-w64-${{matrix.env}}-tcl
-            mingw-w64-${{matrix.env}}-tcllib
-      - name: Fix missing tags
-        run: |
-          git fetch --tags --force
-      - name: Debugging for tags
-        run: |
-          git tag
-          git describe --tags --long
-      - name: Build MSYS2 ${{matrix.sys}} package
-        run: |
-          cd contrib/msys2
-          makepkg-mingw -sCLf --needed --noconfirm
-          pacman -Qlp *.zst
-          echo "MSYS2_PKG=$(ls *.zst)" >> $GITHUB_ENV
-      - name: Install package
-        run: pacman -U --noconfirm contrib/msys2/*.zst
-      - name: Install OSVVM
-        run: nvc --install osvvm
-      - name: Install UVVM
-        run: nvc --install uvvm
-      - name: 'Upload artifact'
-        uses: actions/upload-artifact@v4
-        with:
-          name: 'MSYS2 ${{matrix.sys}} package'
-          path: contrib/msys2/${{ env.MSYS2_PKG }}
-
   pkg-ubuntu:
     name: Package for Ubuntu
     strategy:
@@ -73,8 +23,7 @@ jobs:
         id: version
         run: |
           vers=$(sed -n '1s/AC_INIT(\[.*\], \[\([0-9\.]*\).*\].*/\1/p' configure.ac)
-          full=$(git log --date=format:%Y%m%d --pretty=$vers~git%cd.%h -1)
-          echo "VERSION=$full" >> $GITHUB_ENV
+          echo "VERSION=$vers" >> $GITHUB_ENV
       - name: Build Debian package
         run: |
           ln -s contrib/debian debian

diff --git a/NEWS.md b/NEWS.md
@@ -7,6 +7,11 @@
   other simulators (#1144).
 - Fixed invalid LLVM IR generation which could cause a crash with LLVM
   14 (#1145).
+- MSYS2 binary packages are no longer provided with releases as these
+  become out-of-date too quickly.  Windows users should instead download
+  the self-contained MSI package.
+- The Ubuntu binary packages for releases now have predictable names
+  without the git commit hash (#1131).
 
 ## Version 1.15.1 - 2025-01-22
 - Fixed a crash when a subprogram is called with too many named arguments