From 368b37a1cefbe9c497edb9d0c171fa68737d788e Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Sun, 18 Sep 2022 19:37:42 +0200 Subject: [PATCH] Fix issues with Qt release tarballs (#486) --- .github/workflows/qt-ci.yml | 18 +++++++++++++----- platform/qt/CHANGELOG.md | 6 ++++++ platform/qt/VERSION | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml index 58670b2ee..3350f4f68 100644 --- a/.github/workflows/qt-ci.yml +++ b/.github/workflows/qt-ci.yml @@ -242,11 +242,21 @@ jobs: ninja.exe ninja.exe install + - name: Create artifacts + shell: bash + env: + QT_ARCH: ${{ matrix.name }} + QT_VERSION: ${{ matrix.qt_version }} + run: | + pushd install + tar cjvf ../maplibre-gl-native_${QT_ARCH}_Qt${QT_VERSION}.tar.bz2 * + popd + - name: Upload artifacts uses: actions/upload-artifact@v3 with: name: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }} - path: install + path: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }}.tar.bz2 release: name: Release QMapLibreGL @@ -266,16 +276,14 @@ jobs: uses: actions/download-artifact@v3 with: name: maplibre-gl-native_${{ matrix.name }}_Qt${{ matrix.qt_version }} - path: install - - name: Make tarball + - name: Name tarball env: TAG_NAME: ${{ github.ref_name }} TAG_PLATFORM: ${{ matrix.name }} QT_VERSION: ${{ matrix.qt_version }} run: | - cd install - tar cjvf ../QMapLibreGL_${TAG_NAME//qt-/}_Qt${QT_VERSION}_${TAG_PLATFORM}.tar.bz2 * + mv maplibre-gl-native_${TAG_PLATFORM}_Qt${QT_VERSION}.tar.bz2 ../QMapLibreGL_${TAG_NAME//qt-/}_Qt${QT_VERSION}_${TAG_PLATFORM}.tar.bz2 - name: Release uses: ncipollo/release-action@v1 diff --git a/platform/qt/CHANGELOG.md b/platform/qt/CHANGELOG.md index 216c030e8..4ab33d1e8 100644 --- a/platform/qt/CHANGELOG.md +++ b/platform/qt/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## v2.0.1 + +### 🐞 Bug fixes + +- Fixed issues with release tarballs. + ## v2.0 ### ✨ New features diff --git a/platform/qt/VERSION b/platform/qt/VERSION index 227cea215..38f77a65b 100644 --- a/platform/qt/VERSION +++ b/platform/qt/VERSION @@ -1 +1 @@ -2.0.0 +2.0.1