Fix Workflow

TypeDuck-HK · Jan 9, 2024 · 9c3bae4 · 9c3bae4
1 parent 9b800cc
commit 9c3bae4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 30 deletions.
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - '*'
     tags:
-      - '![0-9]+.*'
+      - '!*'
   pull_request:
 
 jobs:

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -16,7 +16,7 @@ jobs:
         compiler: [g++, clang]
     steps:
       - name: Checkout last commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository }}
           submodules: recursive

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -21,15 +21,11 @@ jobs:
       RIME_PLUGINS: ${{ inputs.rime_plugins }}
     steps:
       - name: Checkout last commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository }}
           submodules: recursive
 
-      - name: Configure build environment
-        run: |
-          echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV
-
       - name: Configure build variant
         if: contains(inputs.build_variant, '-universal')
         run: |
@@ -82,15 +78,15 @@ jobs:
       - name: Create distributable
         run: |
           make xcode/dist
-          tar -cjvf rime-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.tar.bz2 \
+          tar -cjvf rime-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.tar.bz2 \
           dist version-info.txt
-          tar -cjvf rime-deps-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.tar.bz2 \
+          tar -cjvf rime-deps-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.tar.bz2 \
           --exclude '*/.placeholder' \
           bin include lib share
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           path: |
-            rime-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.tar.bz2
-            rime-deps-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.tar.bz2
+            rime-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.tar.bz2
+            rime-deps-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.tar.bz2
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -1,10 +1,9 @@
 name: Release CI
 
 on:
-  workflow_dispatch:
   push:
     tags:
-      - '[0-9]+.*'
+      - '*'
 
 jobs:
   linux:
@@ -25,15 +24,9 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v3
 
-      - name: Get version name
-        run: |
-          echo rime_version="$(git describe --always)" >> $env:GITHUB_ENV
-
       - name: Create GitHub release
-        uses: 'marvinpinto/action-automatic-releases@latest'
+        uses: softprops/action-gh-release@v1
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          automatic_release_tag: ${{ env.rime_version }}
-          title: "librime for TypeDuck: ${{ env.rime_version }}"
+          name: "librime for TypeDuck: ${{ github.ref_name }}"
           files: |
             artifact/*
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -18,15 +18,14 @@ jobs:
       RIME_PLUGINS: ${{ inputs.rime_plugins }}
     steps:
       - name: Checkout last commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository }}
           submodules: recursive
 
       - name: Configure build environment
         run: |
           copy env.vs2022.bat env.bat
-          echo git_ref_name="$(git describe --always)" >> $env:GITHUB_ENV
 
       - name: Cache Boost
         id: cache-boost
@@ -74,14 +73,14 @@ jobs:
 
       - name: Create distributable
         run: |
-          7z a rime-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.7z `
+          7z a rime-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.7z `
           dist version-info.txt
-          7z a -x'!*/.placeholder' rime-deps-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.7z `
+          7z a -x'!*/.placeholder' rime-deps-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.7z `
           bin include lib share
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
           path: |
-            rime-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.7z
-            rime-deps-TypeDuck-${{ env.git_ref_name }}-${{ runner.os }}.7z
+            rime-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.7z
+            rime-deps-TypeDuck-${{ github.ref_name }}-${{ runner.os }}.7z
diff --git a/action-install-plugins-macos.sh b/action-install-plugins-macos.sh
@@ -3,7 +3,7 @@
 export RIME_ROOT="$(cd "$(dirname "$0")"; pwd)"
 
 echo "RIME_PLUGINS=${RIME_PLUGINS}" > version-info.txt
-echo "librime $(git describe --always)" >> version-info.txt
+echo "librime ${GITHUB_REF_NAME}" >> version-info.txt
 
 function action_install_plugin() {
     local plugin="$1"

diff --git a/action-install-plugins-windows.bat b/action-install-plugins-windows.bat
@@ -9,8 +9,7 @@ set clone_options=^
  --no-single-branch
 
 echo RIME_PLUGINS=%RIME_PLUGINS% > version-info.txt
-echo librime >> version-info.txt
-git describe --always >> version-info.txt
+echo librime %GITHUB_REF_NAME% >> version-info.txt
 
 if defined RIME_PLUGINS (
   for %%s in (%RIME_PLUGINS%) do call :install_plugin %%s || exit /b
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
         branches:
           - '*'
         tags:
-          - '![0-9]+.*'
+          - '!*'
       pull_request:
     jobs:
@@ Expand Down @@