Update release workflow (#14)

maplibre · Sep 18, 2022 · 220f0d1 · 220f0d1
1 parent 0ea705e
commit 220f0d1
Show file tree

Hide file tree

Showing 14 changed files with 157 additions and 94 deletions.
diff --git a/.github/workflows/Android-Qt5.yml b/.github/workflows/Android-Qt5.yml
@@ -213,11 +213,17 @@ jobs:
           make -j2
           INSTALL_ROOT=../install make install
 
+      - name: Create artifacts
+        run: |
+          pushd install/home/runner/work/qt-geoservices-maplibre-gl
+          tar cjvf ../../../../../qt-geoservices-maplibre-gl_Android.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_Android
-          path: install/home/runner/work/qt-geoservices-maplibre-gl
+          path: qt-geoservices-maplibre-gl_Android.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -232,14 +238,12 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_Android
-        path: install
 
-    - name: Make tarball
+    - name: Name tarball
       env:
         TAG_NAME: ${{ github.ref_name }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2 Qt
+        mv qt-geoservices-maplibre-gl_Android.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2
 
     - name: Release
       uses: ncipollo/release-action@v1

diff --git a/.github/workflows/Android-Qt6.yml b/.github/workflows/Android-Qt6.yml
@@ -49,7 +49,7 @@ concurrency:
 
 env:
   QT_VERSION: 6.3.2
-  QT_LOCATION_VERSION: 6.3.2.0
+  QT_LOCATION_VERSION: 6.3.2.1
 
 jobs:
   build-plugin:
@@ -172,11 +172,17 @@ jobs:
           cp -r install-x86/Qt/${QT_VERSION}/* install/Qt/${QT_VERSION}/
           cp -r install-x86_64/Qt/${QT_VERSION}/* install/Qt/${QT_VERSION}/
 
+      - name: Create artifacts
+        run: |
+          pushd install
+          tar cjvf ../qt-geoservices-maplibre-gl_Android.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_Android
-          path: install
+          path: qt-geoservices-maplibre-gl_Android.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -191,19 +197,15 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_Android
-        path: install
-
-    - name: Download QtLocation
-      run: |
-        wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2
-        tar xvf QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2 -C install
 
     - name: Make tarball
       env:
         TAG_NAME: ${{ github.ref_name }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2 Qt
+        wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2
+        tar xvf QtLocation_v${QT_LOCATION_VERSION}_Android.tar.bz2
+        tar xvf qt-geoservices-maplibre-gl_Android.tar.bz2
+        tar cjvf qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2 Qt
 
     - name: Release
       uses: ncipollo/release-action@v1

diff --git a/.github/workflows/Linux-Qt5.yml b/.github/workflows/Linux-Qt5.yml
@@ -121,11 +121,17 @@ jobs:
         with:
           build-type: plugin
 
+      - name: Create artifacts
+        run: |
+          pushd install/github/workspace
+          tar cjvf ../../../qt-geoservices-maplibre-gl_Linux.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_Linux
-          path: install/github/workspace
+          path: qt-geoservices-maplibre-gl_Linux.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -140,14 +146,12 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_Linux
-        path: install
 
-    - name: Make tarball
+    - name: Name tarball
       env:
         TAG_NAME: ${{ github.ref_name }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2 Qt
+        mv qt-geoservices-maplibre-gl_Linux.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2
 
     - name: Release
       uses: ncipollo/release-action@v1

diff --git a/.github/workflows/Linux-Qt6.yml b/.github/workflows/Linux-Qt6.yml
@@ -47,7 +47,7 @@ concurrency:
 
 env:
   QT_VERSION: 6.3.2
-  QT_LOCATION_VERSION: 6.3.2.0
+  QT_LOCATION_VERSION: 6.3.2.1
 
 jobs:
   build-plugin:
@@ -84,11 +84,17 @@ jobs:
       - name: Build qt-geoservices-maplibre-gl
         uses: ./source/.github/actions/qt6-build
 
+      - name: Create artifacts
+        run: |
+          pushd install/github/workspace
+          tar cjvf ../../../qt-geoservices-maplibre-gl_Linux.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_Linux
-          path: install/github/workspace
+          path: qt-geoservices-maplibre-gl_Linux.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -103,19 +109,15 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_Linux
-        path: install
-
-    - name: Download QtLocation
-      run: |
-        wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
-        tar xvf QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2 -C install
 
     - name: Make tarball
       env:
         TAG_NAME: ${{ github.ref_name }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2 Qt
+        wget https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
+        tar xvf QtLocation_v${QT_LOCATION_VERSION}_Linux.tar.bz2
+        tar xvf qt-geoservices-maplibre-gl_Linux.tar.bz2
+        tar cjvf qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2 Qt
 
     - name: Release
       uses: ncipollo/release-action@v1

diff --git a/.github/workflows/Windows-Qt5.yml b/.github/workflows/Windows-Qt5.yml
@@ -264,11 +264,20 @@ jobs:
           mingw32-make.exe
           INSTALL_ROOT=../install mingw32-make.exe install
 
+      - name: Create artifacts
+        shell: bash
+        env:
+          TAG_ARCH: ${{ matrix.config.qtarch }}
+        run: |
+          pushd install/a/qt-geoservices-maplibre-gl
+          tar cjvf ../../../qt-geoservices-maplibre-gl_Windows_${TAG_ARCH}.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }}
-          path: install/a/qt-geoservices-maplibre-gl
+          path: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }}.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -279,7 +288,9 @@ jobs:
       matrix:
         config:
           - qtarch: msvc2019_64
+            outarch: msvc2019
           - qtarch: mingw81_64
+            outarch: mingw
     permissions:
       contents: write
 
@@ -288,20 +299,19 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }}
-        path: install
 
     - name: Make tarball
       shell: bash
       env:
         TAG_NAME: ${{ github.ref_name }}
-        TAG_ARCH: ${{ matrix.config.qtarch }}
+        QT_ARCH: ${{ matrix.config.qtarch }}
+        TAG_ARCH: ${{ matrix.config.outarch }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Windows_${TAG_ARCH}.tar.bz2 Qt
+        mv qt-geoservices-maplibre-gl_Windows_${QT_ARCH}.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_win64_${TAG_ARCH}.tar.bz2
 
     - name: Release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_Windows_${{ matrix.config.qtarch }}.tar.bz2
+        artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_win64_${{ matrix.config.outarch }}.tar.bz2
         allowUpdates: true
         draft: true
diff --git a/.github/workflows/Windows-Qt6.yml b/.github/workflows/Windows-Qt6.yml
@@ -49,7 +49,7 @@ concurrency:
 
 env:
   QT_VERSION: 6.3.2
-  QT_LOCATION_VERSION: 6.3.2.0
+  QT_LOCATION_VERSION: 6.3.2.1
   CCACHE_CONFIGPATH: C:/Users/runneradmin/AppData/Roaming/ccache/ccache.conf
 
 jobs:
@@ -141,11 +141,20 @@ jobs:
           ninja.exe
           DESTDIR=../install ninja.exe install
 
+      - name: Create artifacts
+        shell: bash
+        env:
+          TAG_ARCH: ${{ matrix.config.qtarch }}
+        run: |
+          pushd install/a/qt-geoservices-maplibre-gl
+          tar cjvf ../../../qt-geoservices-maplibre-gl_Windows_${TAG_ARCH}.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }}
-          path: install/a/qt-geoservices-maplibre-gl
+          path: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }}.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -156,7 +165,9 @@ jobs:
       matrix:
         config:
           - qtarch: msvc2019_64
+            outarch: msvc2019
           - qtarch: mingw_64
+            outarch: mingw
     permissions:
       contents: write
 
@@ -165,29 +176,23 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }}
-        path: install
-
-    - name: Download QtLocation
-      shell: bash
-      env:
-        QT_PLATFORM: ${{ matrix.config.qtarch }}
-      run: |
-        choco upgrade wget
-        wget.exe https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Windows_${QT_PLATFORM}.tar.bz2
-        tar xvf QtLocation_v${QT_LOCATION_VERSION}_Windows_${QT_PLATFORM}.tar.bz2 -C install
 
     - name: Make tarball
       shell: bash
       env:
         TAG_NAME: ${{ github.ref_name }}
-        TAG_ARCH: ${{ matrix.config.qtarch }}
+        QT_ARCH: ${{ matrix.config.qtarch }}
+        TAG_ARCH: ${{ matrix.config.outarch }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Windows_${TAG_ARCH}.tar.bz2 Qt
+        choco upgrade wget
+        wget.exe https://github.com/ntadej/qtlocation/releases/download/v${QT_LOCATION_VERSION}/QtLocation_v${QT_LOCATION_VERSION}_Windows_${QT_ARCH}.tar.bz2
+        tar xvf QtLocation_v${QT_LOCATION_VERSION}_Windows_${QT_ARCH}.tar.bz2
+        tar xvf qt-geoservices-maplibre-gl_Windows_${QT_ARCH}.tar.bz2
+        tar cjvf qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_win64_${TAG_ARCH}.tar.bz2 Qt
 
     - name: Release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_Windows_${{ matrix.config.qtarch }}.tar.bz2
+        artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_win64_${{ matrix.config.outarch }}.tar.bz2
         allowUpdates: true
         draft: true
diff --git a/.github/workflows/iOS-Qt5.yml b/.github/workflows/iOS-Qt5.yml
@@ -99,7 +99,7 @@ jobs:
             -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
             -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
             -DCMAKE_FIND_ROOT_PATH="$Qt5_Dir" \
-            -DCMAKE_INSTALL_PREFIX=../install-qmaplibregl \
+            -DCMAKE_INSTALL_PREFIX="${Qt5_Dir//\/bin/}" \
             -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
             -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 \
             -DCMAKE_PREFIX_PATH="$Qt5_Dir" \
@@ -108,19 +108,25 @@ jobs:
             -DMBGL_QT_LIBRARY_ONLY=ON \
             -DMBGL_QT_STATIC=ON
           ninja
-          ninja install
+          DESTDIR=../install ninja install
 
       - name: Upload ccache.log
         uses: actions/upload-artifact@v3
         with:
           name: ccache_iOS
           path: ccache.log
 
+      - name: Create artifacts
+        run: |
+          pushd install/Users/runner/work/qt-geoservices-maplibre-gl
+          tar cjvf ../../../../../QMapLibreGL_iOS.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: maplibre-gl-native_iOS
-          path: install-qmaplibregl
+          path: QMapLibreGL_iOS.tar.bz2
 
   build-plugin:
     name: "Build qt-geoservices-maplibre-gl"
@@ -164,21 +170,28 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: maplibre-gl-native_iOS
-          path: install-qmaplibregl
 
       - name: Build qt-geoservices-maplibre-gl
         run: |
+          tar xvf QMapLibreGL_iOS.tar.bz2 -C ..
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           mkdir build && cd build
-          qmake ../source/ QMAPLIBREGL_PATH=../install-qmaplibregl
+          qmake ../source/
           make -j2
           INSTALL_ROOT=../install make install
 
+      - name: Create artifacts
+        run: |
+          pushd install/Users/runner/work/qt-geoservices-maplibre-gl
+          tar xvf ../../../../../QMapLibreGL_iOS.tar.bz2
+          tar cjvf ../../../../../qt-geoservices-maplibre-gl_iOS.tar.bz2 Qt
+          popd
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: qt-geoservices-maplibre-gl_iOS
-          path: install/Users/runner/work/qt-geoservices-maplibre-gl
+          path: qt-geoservices-maplibre-gl_iOS.tar.bz2
 
   release:
     name: "Release qt-geoservices-maplibre-gl"
@@ -193,14 +206,12 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: qt-geoservices-maplibre-gl_iOS
-        path: install
 
     - name: Make tarball
       env:
         TAG_NAME: ${{ github.ref_name }}
       run: |
-        cd install
-        tar cjvf ../qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_iOS.tar.bz2 Qt
+        mv qt-geoservices-maplibre-gl_iOS.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_iOS.tar.bz2
 
     - name: Release
       uses: ncipollo/release-action@v1