Merge remote-tracking branch 'origin/main'

flxzt · Nov 21, 2024 · cdf9c2f · cdf9c2f
2 parents 278d045 + c8f283c
commit cdf9c2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -36,12 +36,13 @@ jobs:
           echo "archive=$(basename _mesonbuild/meson-dist/rnote-*.tar.xz | tail -n1)" >> $GITHUB_OUTPUT
           echo "sha=$(basename _mesonbuild/meson-dist/rnote-*.tar.xz.sha256sum | tail -n1)" >> $GITHUB_OUTPUT
       - name: Upload dist archive (Workflow Artifact)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: rnote-dist-archive-artifact
           path: |
             _mesonbuild/meson-dist/${{ steps.register_archive_file_names.outputs.archive }}
             _mesonbuild/meson-dist/${{ steps.register_archive_file_names.outputs.sha }}
+          include-hidden-files: true
           if-no-files-found: error
       - name: Upload dist archive (Release Asset)
         if: ${{ github.event_name == 'release' }}

diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set installer name
         id: set_installer_name
         shell: bash
-        run: echo "name=rnote-win-installer-$(echo ${GITHUB_REF_NAME#v})-x86_64" >> $GITHUB_OUTPUT
+        run: echo "name=rnote-win-installer-$(echo ${GITHUB_REF_NAME#v} | sed -e 's/[^A-Za-z0-9._-]/_/g')-x86_64" >> $GITHUB_OUTPUT
       - name: Setup MSYS2
         uses: msys2/setup-msys2@v2
         with:
@@ -48,7 +48,7 @@ jobs:
       - name: Build installer
         run: meson compile build-installer -C _mesonbuild
       - name: Upload installer (Workflow Artifact)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: rnote-win-installer-artifact
           path: _mesonbuild/${{ steps.set_installer_name.outputs.name }}.exe