CI: modify ci

KangLin · Feb 5, 2024 · 5c6dadc · 5c6dadc
1 parent 7a00909
commit 5c6dadc
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 32 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -145,6 +145,21 @@ jobs:
             android ${{matrix.config_arch}} \
             "https://github.com/KangLin/Calendar/releases/download/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk,https://sourceforge.net/projects/rabbitcalendar/files/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk"
 
+      - name: Update xml file
+             if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_arch == 'android_armv7' }}
+             working-directory: ${{github.workspace}}/build
+             run: |
+               cp ${{github.workspace}}/Update/update_android.xml .
+               MD5=`md5sum Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk | awk '{print $1}'`
+               echo "MD5:${MD5}"
+               sed -i "s/<VERSION>.*</<VERSION>${{env.Calendar_VERSION}}</g" update_android.xml
+               sed -i "s/<INFO>.*</<INFO>Release Calendar ${{env.Calendar_VERSION}}</g" update_android.xml
+               sed -i "s/<TIME>.*</<TIME>`date`</g" update_android.xml
+               sed -i "s/<ARCHITECTURE>.*</<ARCHITECTURE>${{matrix.qt_arch}}</g" update_android.xml
+               sed -i "s/<MD5SUM>.*</<MD5SUM>${MD5}</g" update_android.xml
+               sed -i "s:<URL>.*<:<URL>https\://github.com/KangLin/Calendar/releases/download/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk<:g" update_android.xml
+               sed -i "s/<MIN_UPDATE_VERSION>.*</<MIN_UPDATE_VERSION>${{env.Calendar_VERSION}}</g" update_android.xml
+      
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v3
@@ -153,3 +168,4 @@ jobs:
           path: |
             ${{github.workspace}}/build/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
             ${{github.workspace}}/build/update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json
+            ${{github.workspace}}/build/update_android.xml
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 }}
-  Calendar_VERSION: v1.0.17
+  Calendar_VERSION: v1.0.18
 
 on: 
   push:
@@ -94,7 +94,7 @@ jobs:
 #          echo "Get file signatures in linux: md5sum file" >> ${{github.workspace}}/Note.md
 
       - name: Upload To Github Release
-        #if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         run: |
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Note.md
           gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Note.md ${{ github.workspace }}/update.json
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -35,7 +35,7 @@ jobs:
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install
       qt_modules: qtwebengine ${{matrix.qt_modules}}
-      Calendar_VERSION: 1.0.17
+      Calendar_VERSION: 1.0.18
       artifact_name: build_macos
       VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
 

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -52,7 +52,7 @@ jobs:
       CMAKE_GENERATOR: "Visual Studio 17 2022"
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
       CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
-      Calendar_VERSION: v1.0.17
+      Calendar_VERSION: v1.0.18
       VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
       qt_modules: ${{matrix.qt_modules}}
       artifact_name: build_msvc
@@ -137,14 +137,6 @@ jobs:
           makensis Install.nsi
           copy Calendar_Setup_${{env.Calendar_VERSION}}.exe Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe
 
-#      - name: Update version configure file
-#        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }}
-#        working-directory: ${{github.workspace}}\build
-#        run: |
-#          .\install\bin\CalendarApp.exe ^
-#             -f "${{github.workspace}}\build\version.json" ^
-#             --foc 0
-
       - name: Update configure file
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
         working-directory: ${{github.workspace}}\build
@@ -156,6 +148,12 @@ jobs:
                -m "${{env.Calendar_VERSION}}" ^
                -u "https://github.com/KangLin/Calendar/releases/download/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe;https://sourceforge.net/projects/rabbitcalendar/files/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe"
 
+      - name: Update xml file
+              if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }}
+              working-directory: ${{github.workspace}}\build
+              run: |
+                mv update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json.xml update_windows.xml
+
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release'}}
         uses: actions/upload-artifact@v3
@@ -164,4 +162,4 @@ jobs:
           path: |
             ${{github.workspace}}\build\Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe
             ${{github.workspace}}\build\update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json
-            ${{github.workspace}}\build\update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json.xml
+            ${{github.workspace}}\build\update_windows.xml
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -22,7 +22,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu
-      Calendar_VERSION: 1.0.17
+      Calendar_VERSION: 1.0.18
       artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs

diff --git a/.travis.yml b/.travis.yml
@@ -50,7 +50,7 @@ before_install:
   - sudo Xvfb :99 -ac &
   - export DISPLAY=:99.0
   - mkdir -p ${SOURCE_DIR}/Tools
-  - export VERSION="v1.0.17"
+  - export VERSION="v1.0.18"
 
 install:
   - cd ${SOURCE_DIR}

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -130,7 +130,7 @@ GET_VERSION(OUT_VERSION Calendar_VERSION
     OUT_REVISION Calendar_REVISION)
 message("Calendar_VERSION:${Calendar_VERSION}; Calendar_REVISION:${Calendar_REVISION}")
 if(NOT Calendar_VERSION)
-    set(Calendar_VERSION "v1.0.17")
+    set(Calendar_VERSION "v1.0.18")
 endif()
 set(VERSION ${Calendar_VERSION})
 

diff --git a/Install/Install.nsi b/Install/Install.nsi
@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Calendar"
 !define PRODUCT_APP_NAME "CalendarApp"
-!define PRODUCT_VERSION "v1.0.17"
+!define PRODUCT_VERSION "v1.0.18"
 !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/Update/update.json b/Update/update.json
@@ -0,0 +1,7 @@
+{
+    "redirect": [
+        {
+          "version":"v1.0.18"
+        }
+    ]
+}
diff --git a/Update/update.xml b/Update/update.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <REDIRECT>
-    <VERSION>v1.0.17</VERSION>
+    <VERSION>v1.0.18</VERSION>
     <WINDOWS>
-        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.17/update_windows.xml</URL>
-        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.17/update_windows.xml/download</URL>
+        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.18/update_windows.xml</URL>
+        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.18/update_windows.xml/download</URL>
     </WINDOWS>
     <LINUX>
-        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.17/update_linux.xml</URL>
-        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.17/update_linux.xml/download</URL>
+        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.18/update_linux.xml</URL>
+        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.18/update_linux.xml/download</URL>
     </LINUX>
     <LINUX_APPIMAGE>
-        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.17/update_linux.xml</URL>
-        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.17/update_linux.xml/download</URL>
+        <URL>https://github.com/KangLin/Calendar/releases/download/v1.0.18/update_linux.xml</URL>
+        <URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.18/update_linux.xml/download</URL>
     </LINUX_APPIMAGE>
 </REDIRECT>
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 #TODO: Change version
-version: 'v1.0.17.{build}'
+version: 'v1.0.18.{build}'
 
 cache:
   - ..\other_source

diff --git a/ci/build.sh b/ci/build.sh
@@ -115,10 +115,10 @@ esac
 
 export PKG_CONFIG_PATH=${ThirdLibs_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then
-    export VERSION="v1.0.17"
+    export VERSION="v1.0.18"
 fi
 if [ -z "$VERSION" ]; then
-    export VERSION="v1.0.17"
+    export VERSION="v1.0.18"
 fi
 
 export UPLOADTOOL_BODY="Release Calendar ${VERSION}.<br> The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)"

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-rabbitcalendar (1.0.17) unstable; urgency=medium
+rabbitcalendar (1.0.18) unstable; urgency=medium
 
-  * Modify debian package
 
- -- Kang Lin <[email protected]>  Sat, 20 Apr 2019 19:53:02 -0700
+
+ -- Kang Lin <[email protected]>  Mon, 05 Feb 2024 13:10:51 +0800
diff --git a/deploy.sh b/deploy.sh
@@ -40,7 +40,7 @@ sed -i "s/Calendar_VERSION:.*/Calendar_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.git
 sed -i "s/Calendar_VERSION:.*/Calendar_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/mingw.yml
 sed -i "s/Calendar_VERSION:.*/Calendar_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/android.yml
 sed -i "s/Calendar_VERSION:.*/Calendar_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/build.yml
-
+sed -i "s/          \"version\":[[:blank:]]*\"v\?[0-9]\+\.[0-9]\+\.[0-9]\+\"/          \"version\":\"${VERSION}\"/g" ${SOURCE_DIR}/Update/update.json
 
 DEBIAN_VERSION=`echo ${VERSION}|cut -d "v" -f 2`
 sed -i "s/calendar (.*)/calendar (${DEBIAN_VERSION})/g" ${SOURCE_DIR}/debian/changelog