CI: update actions/download-artifact to 4

KangLin · Sep 13, 2024 · 357cbc3 · 357cbc3
1 parent 07d2e7e
commit 357cbc3
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 47 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      TransformCoordinate_VERSION: "1.1.1"
+      TransformCoordinate_VERSION: "1.1.2"
       VCPKGGITCOMMITID: 007aaced1a9d3245e28a2ba9395dca88ea890db1
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
@@ -152,13 +152,13 @@ jobs:
           APK_FILE=`find . -name "android-*.apk"`
           echo "cp $APK_FILE ..."
           cp $APK_FILE TransformCoordinate_${{env.TransformCoordinate_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
-          echo "Developer library"
+          echo "Developer library..."
           cmake --build . --verbose --config ${{matrix.BUILD_TYPE}} --target install
           7z a TransformCoordinate_${{env.TransformCoordinate_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip install/*
 
       - name: Update artifact
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }}
-        uses: actions/upload-artifact@v3
+        if: ${{ matrix.BUILD_TYPE == 'Release' }}
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ name: build
 env:
   artifact_path: artifact_path
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  TransformCoordinate_VERSION: "v1.1.1"
+  TransformCoordinate_VERSION: "v1.1.2"
 
 on:
   push:
@@ -36,50 +36,50 @@ jobs:
   deploy:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
-    needs: [ubuntu, mingw, msvc, macos, android]
+    needs: [ubuntu, msvc, macos, android]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
         with:
           submodules: false
 
 #      - name: Download all artifact
-#        uses: actions/download-artifact@v3
+#        uses: actions/download-artifact@v4
 #        with:
 #          path: ${{ env.artifact_path }}
 
       - name: Download ubuntu
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.ubuntu.outputs.name }}
           path: ${{ env.artifact_path }}
 
       - name: Download msvc
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.msvc.outputs.name }}
           path: ${{ env.artifact_path }}
 
       - name: Download mingw
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.mingw.outputs.name }}
           path: ${{ env.artifact_path }}
 
       - name: Download macos
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.macos.outputs.name }}
           path: ${{ env.artifact_path }}
 
       - name: Download android
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.android.outputs.name }}
           path: ${{ env.artifact_path }}
 
       - name: Download doxygen
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.doxygen.outputs.name }}
           path: ${{ env.artifact_path }}

diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -21,7 +21,7 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_doxygen
       DOXYGEN_VERSION: 1.9.5
-      TransformCoordinate_VERSION: "v1.1.1"
+      TransformCoordinate_VERSION: "v1.1.2"
       artifact_name: build_doxygen
 
     # Map the job outputs to step outputs
@@ -92,7 +92,7 @@ jobs:
 
       - name: Update artifact
         if: ${{ env.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: macos-13
 
     env:
-      TransformCoordinate_VERSION: "1.1.1"
+      TransformCoordinate_VERSION: "1.1.2"
       BUILD_TYPE:  ${{ matrix.BUILD_TYPE }}
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
@@ -114,7 +114,7 @@ jobs:
 
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -28,7 +28,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}\.cache\source
       TOOSL_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw
-      TransformCoordinate_VERSION: "1.1.1"
+      TransformCoordinate_VERSION: "1.1.2"
       artifact_name: build_mingw
 
     # Map the job outputs to step outputs
@@ -105,7 +105,7 @@ jobs:
 
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: windows-latest
 
     env:
-      TransformCoordinate_VERSION: "v1.1.1"
+      TransformCoordinate_VERSION: "v1.1.2"
       SOURCE_DIR:  ${{github.workspace}}\.cache\source
       TOOSL_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install
@@ -150,7 +150,7 @@ jobs:
 
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version != '5.15.2' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -25,7 +25,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu
-      TransformCoordinate_VERSION: "1.1.1"
+      TransformCoordinate_VERSION: "1.1.2"
       artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs
@@ -127,7 +127,7 @@ jobs:
 
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.KangLinStudio.TransformCoordinate"
     android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="1.1.1">
+    android:versionName="1.1.2">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,13 +33,13 @@ IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
         )
 
         if(NOT TransformCoordinate_VERSION)
-            SET(TransformCoordinate_VERSION "v1.1.1")
+            SET(TransformCoordinate_VERSION "v1.1.2")
         endif()
     ENDIF()
 ENDIF()
 message("TransformCoordinate_VERSION:${TransformCoordinate_VERSION};TransformCoordinate_REVISION:${TransformCoordinate_REVISION}")
 if(NOT TransformCoordinate_VERSION)
-    SET(TransformCoordinate_VERSION "v1.1.1")
+    SET(TransformCoordinate_VERSION "v1.1.2")
 endif()
 string(REPLACE "v" "" TransformCoordinate_VERSION ${TransformCoordinate_VERSION})
 if(TransformCoordinate_REVISION)

diff --git a/Install/Install.nsi b/Install/Install.nsi
@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "TransformCoordinate"
 !define PRODUCT_APP_NAME "TransformCoordinateApp"
-!define PRODUCT_VERSION "v1.1.1"
+!define PRODUCT_VERSION "v1.1.2"
 !define PRODUCT_PUBLISHER "KangLin studio"
 !define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

diff --git a/README.md b/README.md
@@ -58,25 +58,25 @@
 
 - Ubuntu
   - 包含玉兔公共库(RabbitCommon)
-    - [开发库 libtransformcoordinate-dev_1.1.1_RabbitCommon_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/libtransformcoordinate-dev_1.1.1_RabbitCommon_amd64.deb)
-    - [运行库 libtransformcoordinate_1.1.1_RabbitCommon_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/libtransformcoordinate_1.1.1_RabbitCommon_amd64.deb)
-    - [转换示例程序 transformcoordinate_1.1.1_RabbitCommon_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/transformcoordinate_1.1.1_RabbitCommon_amd64.deb)
+    - [开发库 libtransformcoordinate-dev_1.1.2_RabbitCommon_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/libtransformcoordinate-dev_1.1.2_RabbitCommon_amd64.deb)
+    - [运行库 libtransformcoordinate_1.1.2_RabbitCommon_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/libtransformcoordinate_1.1.2_RabbitCommon_amd64.deb)
+    - [转换示例程序 transformcoordinate_1.1.2_RabbitCommon_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/transformcoordinate_1.1.2_RabbitCommon_amd64.deb)
     - 安装
 
-          sudo apt install ./libtransformcoordinate_1.1.1_RabbitCommon_amd64.deb \
-                           ./transformcoordinate_1.1.1_RabbitCommon_amd64.deb
+          sudo apt install ./libtransformcoordinate_1.1.2_RabbitCommon_amd64.deb \
+                           ./transformcoordinate_1.1.2_RabbitCommon_amd64.deb
 
   - 不包含玉兔公共库(RabbitCommon)。安装前需要先从 [RabbitCommon](https://github.com/KangLin/RabbitCommon/releases/latest) 下载，并安装 RabbitCommon。
-    - [开发库 libtransformcoordinate-dev_1.1.1_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/libtransformcoordinate-dev_1.1.1_amd64.deb)
-    - [运行库 libtransformcoordinate_1.1.1_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/libtransformcoordinate_1.1.1_amd64.deb)
-    - [转换示例程序 transformcoordinate_1.1.1_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/transformcoordinate_1.1.1_amd64.deb)
+    - [开发库 libtransformcoordinate-dev_1.1.2_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/libtransformcoordinate-dev_1.1.2_amd64.deb)
+    - [运行库 libtransformcoordinate_1.1.2_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/libtransformcoordinate_1.1.2_amd64.deb)
+    - [转换示例程序 transformcoordinate_1.1.2_amd64.deb](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/transformcoordinate_1.1.2_amd64.deb)
 
 - Windows
-  - [TransformCoordinate_v1.1.1_win64_msvc2019_64_qt6.6.2_Setup.exe](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/TransformCoordinate_v1.1.1_win64_msvc2019_64_qt6.6.2_Setup.exe)
-  - [TransformCoordinate_v1.1.1_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/TransformCoordinate_v1.1.1_win32_msvc2017_qt5.12.12_Setup.exe)
+  - [TransformCoordinate_v1.1.2_win64_msvc2019_64_qt6.6.2_Setup.exe](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/TransformCoordinate_v1.1.2_win64_msvc2019_64_qt6.6.2_Setup.exe)
+  - [TransformCoordinate_v1.1.2_win32_msvc2017_qt5.12.12_Setup.exe](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/TransformCoordinate_v1.1.2_win32_msvc2017_qt5.12.12_Setup.exe)
 - Android
-  - [TransformCoordinate_1.1.1_android_arm64_v8a_qt6.6.2_Release.apk](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/TransformCoordinate_1.1.1_android_arm64_v8a_qt6.6.2_Release.apk)
-  - [TransformCoordinate_1.1.1_android_x86_64_qt6.6.2_Release.apk](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.1/TransformCoordinate_1.1.1_android_x86_64_qt6.6.2_Release.apk)
+  - [TransformCoordinate_1.1.2_android_arm64_v8a_qt6.6.3_Release.apk](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/TransformCoordinate_1.1.2_android_arm64_v8a_qt6.6.3_Release.apk)
+  - [TransformCoordinate_1.1.2_android_x86_64_qt6.6.3_Release.apk](https://github.com/KangLin/TransformCoordinate/releases/download/v1.1.2/TransformCoordinate_1.1.2_android_x86_64_qt6.6.3_Release.apk)
 - [更多的下载包](https://github.com/KangLin/TransformCoordinate/releases/latest)
 
 ### 编译

diff --git a/Update/update.xml b/Update/update.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <REDIRECT>
-    <VERSION>v1.1.1</VERSION>
+    <VERSION>v1.1.2</VERSION>
 </REDIRECT>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 # 作者：康林<[email protected]>
 
 #TODO: Change version
-version: 'v1.1.1.{build}'
+version: 'v1.1.2.{build}'
 
 environment:
   STOREPASS:
@@ -10,7 +10,7 @@ environment:
     secure: EoBPaPuJ6u9UDYpQWjKhUg==
   QT_PASSWORD:
     secure: ejAYGgB+3sBispRxUSr0xw==
-  TransformCoordinate_VERSION: "v1.1.1"
+  TransformCoordinate_VERSION: "v1.1.2"
 
   matrix: 
   ##### msvc 2015 ########

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,9 @@
-transformcoordinate (1.1.1) unstable; urgency=medium
+transformcoordinate (1.1.2) unstable; urgency=medium
 
+    * CI: update actions/download-artifact to 4
+    * FIX: Modify author format (#3)
+    * CI: update RabbitCommon version to 2.2.6
+    * Fix deploy.sh bug
+    * CI: modify android.yml
 
-
- -- Kang Lin <[email protected]>  Mon, 17 Jun 2024 16:17:48 +0800
+ -- Kang Lin <[email protected]>  Fri, 13 Sep 2024 15:02:50 +0800
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "transformcoordinate",
-    "version-string": "1.1.1",
+    "version-string": "1.1.2",
     "license": "GPL-3.0",
     "homepage": "https://github.com/KangLin/TransformCoordinate",
 

diff --git a/vcpkg/manifests/vcpkg.json b/vcpkg/manifests/vcpkg.json
@@ -1,6 +1,6 @@
 {
     "name": "transformcoordinate",
-    "version-string": "1.1.1",
+    "version-string": "1.1.2",
     "license": "GPL-3.0",
     "homepage": "https://github.com/KangLin/TransformCoordinate",