Skip to content

Commit

Permalink
CI: update actions/download-artifact to 4
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Sep 13, 2024
1 parent 07d2e7e commit 8ae7faf
Show file tree
Hide file tree
Showing 19 changed files with 94 additions and 157 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -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: |
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -94,7 +94,7 @@ jobs:
- name: Make Note.md file
run: |
echo "[:cn: 修改日志](https://github.com/KangLin/TransformCoordinate/blob/${{env.TransformCoordinate_VERSION}}/ChangeLog_zh_CN.md) [:us: Change log](https://github.com/KangLin/TransformCoordinate/blob/${{env.TransformCoordinate_VERSION}}/ChangeLog.md)" > ${{github.workspace}}/Note.md
echo "[:cn: 修改日志](https://github.com/KangLin/TransformCoordinate/blob/${{env.TransformCoordinate_VERSION}}/ChangeLog.md)" > ${{github.workspace}}/Note.md
echo "" >> ${{github.workspace}}/Note.md
echo "文件签名:" >> ${{github.workspace}}/Note.md
cd ${{ env.artifact_path }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
3 changes: 1 addition & 2 deletions App/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ ENDIF()
set(OTHER_FILES ${CMAKE_SOURCE_DIR}/License.md
${CMAKE_SOURCE_DIR}/Authors.md
${CMAKE_SOURCE_DIR}/ChangeLog.md
${CMAKE_SOURCE_DIR}/Authors_zh_CN.md
${CMAKE_SOURCE_DIR}/ChangeLog_zh_CN.md)
${CMAKE_SOURCE_DIR}/Authors_zh_CN.md)
INSTALL_FILE(SOURCES ${OTHER_FILES}
DESTINATION ${CMAKE_INSTALL_DOCDIR}
COMPONENT Application)
Expand Down
2 changes: 1 addition & 1 deletion App/android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
84 changes: 41 additions & 43 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,66 +1,64 @@
- v1.1.2
- Modify author format
- Use [RabbitCommon v2.2.6](https://github.com/KangLin/RabbitCommon/releases/tag/v2.2.6)

- 修改作者格式
- 使用 [RabbitCommon v2.2.6](https://github.com/KangLin/RabbitCommon/releases/tag/v2.2.6)
- v1.1.1
- Modify share/org.Rabbit.SerialPortAssistant.desktop to Categories
- Fix debian/rules in aarch64
- Use [RabbitCommon v2.2.5](https://github.com/KangLin/RabbitCommon/releases/tag/v2.2.5)
- 修复 debian/rules 并行错误
- 修复 debian/rules in aarch64
- 使用 [RabbitCommon v2.2.5](https://github.com/KangLin/RabbitCommon/releases/tag/v2.2.5)

- v1.1.0
- Modify TransformCoordinateFiles
- 修改 TransformCoordinateFiles

- v1.0.4
- Modify prompt
- 修改提示信息

- v1.0.3
- Modify org.Rabbit.TransformCoordinate.desktop
- Rename icon theme rabbit-*
- Modify version format
- 重命名图标方案 rabbit-*
- 修改 org.Rabbit.TransformCoordinate.desktop
- 修改版本格式

- v1.0.2
- debian: Check whether the RabbitCommon development library
is installed on the system, and if so, install it on the system.
If not, compile RabbitCommon from source
and install it to /opt/TransformCoordinate
- Rename share/TransformCoordinate.desktop to share/org.Rabbit.TransformCoordinate.desktop
- debian: 判断系统中是否安装有RabbitCommon开发库,如果有,则安装到系统。如果没
有,则从源码编译RabbitCommon,并安装到/opt/TransformCoordinate
- 重命名 share/TransformCoordinate.desktop 到 share/org.Rabbit.TransformCoordinate.desktop

- v1.0.1
- Modify documents
- Modify ci
- 修改文档
- 修改自动化编译

- v1.0.0
- Use [RabbitCommon v2.2.1](https://github.com/KangLin/RabbitCommon/releases/tag/v2.2.1)
- 使用 [RabbitCommon v2.2.1](https://github.com/KangLin/RabbitCommon/releases/tag/v2.2.1)

- v0.0.11
+ Fix android bug
+ Replace RabbitCommon::CDir::GetOpenDirectory with QFileDialog::getExistingDirectory
- 修复 Android 错误
- 用 QFileDialog::getExistingDirectory 替换 RabbitCommon::CDir::GetOpenDirectory

- v0.0.10
+ Modify ci
+ Add github actions
+ Use RabbitCommon V2
+ Add Log
+ Add set style
+ Use CPack to package
+ 修改自动编译
- 增加 github actions
+ 使用 RabbitCommon V2
+ 增加日志菜单
+ 增加设置样式菜单
+ 使用 CPack 打包

- v0.0.9
+ Add android sign
+ Modify update

+ 修改更新
+ 增加 android 签名
- v0.0.8
+ Modify translation
+ Modify ci
+ Add install runtime

+ 修改翻译
+ 修改自动化编译
+ 增加运行库安装
- v0.0.7
+ Modify translation
+ Modify open file
+ Modify status bar prompt
+ Modify CMAKE_INSTALL_PREFIX for android
+ Modify translation and README
+ android hide splash screen

+ 修改翻译
+ 修改打开文件对话框
+ 修改状态栏提示
+ 修改 CMAKE_INSTALL_PREFIX android
+ 修改翻译和 README
+ android 启动 Splash screen 隐藏
- v0.0.6
+ Transform coordinate
+ Modify translation
+ 坐标转换
+ 修改翻译
Loading

0 comments on commit 8ae7faf

Please sign in to comment.