From f5f0ab450235403076f868c797c52f445ad8f690 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 21:08:43 +0800 Subject: [PATCH 01/23] ci: initialize the doc deployment ci. --- .github/prepare_release.sh | 3 +++ .github/workflows/release-patch.yml | 34 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.github/prepare_release.sh b/.github/prepare_release.sh index 3a5db06f..1db3bf44 100755 --- a/.github/prepare_release.sh +++ b/.github/prepare_release.sh @@ -77,5 +77,8 @@ do nuget pack $nuspec -version $updated_version done +# write the version to the file +echo $updated_version > version.txt + cd .. exit 0 diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 5b5024d6..7d99ed0c 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -1,10 +1,15 @@ name: auto-patch-release +# on: +# workflow_run: +# workflows: ["release-patch-trigger"] +# types: +# - completed + on: - workflow_run: - workflows: ["release-patch-trigger"] - types: - - completed + pull_request: + branches: + - master env: NUGET_API_TOKEN: ${{ secrets.LLAMA_SHARP_NUGET_KEY }} @@ -49,6 +54,23 @@ jobs: name: "drop-ci-packages" path: './temp' - - name: Push LLamaSharp packages to nuget.org - run: dotnet nuget push ./temp/LLamaSharp*.nupkg --source https://www.nuget.org -k ${{ secrets.LLAMA_SHARP_NUGET_KEY }} --skip-duplicate + # - name: Push LLamaSharp packages to nuget.org + # run: dotnet nuget push ./temp/LLamaSharp*.nupkg --source https://www.nuget.org -k ${{ secrets.LLAMA_SHARP_NUGET_KEY }} --skip-duplicate + + - uses: actions/setup-python@v5 + with: + python-version: 3.x + - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV + - uses: actions/cache@v4 + with: + key: mkdocs-material-${{ env.cache_id }} + path: .cache + restore-keys: | + mkdocs-material- + - run: pip install mkdocs-material + - run: mkdocs gh-deploy --force + - run: | + version=$(cat ./temp/LLamaSharp.version) + mike deploy --push --update-aliases $version latest + mike set-default --push latest From 23a5cb5355efc4ddb4eeb2851e35180d96f1d877 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 21:10:36 +0800 Subject: [PATCH 02/23] disable build ci. --- .github/workflows/main.yml | 100 ++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c167dd4..189fdcde 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -# name: CI +name: CI # on: # push: # branches: [master] @@ -8,49 +8,55 @@ # group: ${{ github.workflow }}-${{ github.ref }} # cancel-in-progress: true -# jobs: -# build: -# name: Test -# runs-on: ${{ matrix.os }} -# strategy: -# max-parallel: 2 -# fail-fast: false -# matrix: -# build: [linux-release, windows-release, osx-release] -# include: -# - build: linux-release -# os: ubuntu-latest -# config: release -# - build: osx-release -# os: macos-latest -# config: release -# - build: windows-release -# os: windows-2019 -# config: release -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/setup-dotnet@v4 -# with: -# dotnet-version: | -# 7.0.x -# 8.0.x -# - name: Cache Packages -# uses: actions/cache@v4 -# with: -# key: "unit_test_models" -# path: LLama.Unittest/Models -# # workaround for actions/setup-dotnet#155 -# - name: Clear package cache -# run: dotnet clean LLamaSharp.sln && dotnet nuget locals all --clear -# - name: Restore packages -# run: dotnet restore LLamaSharp.sln -# - name: Build -# run: dotnet build LLamaSharp.sln -c ${{ matrix.config }} --no-restore -# - name: Test -# run: dotnet test LLamaSharp.sln -c ${{ matrix.config }} -l "console;verbosity=detailed" --diag:logs/log.txt -# - name: Upload artifacts -# if: always() -# uses: actions/upload-artifact@v3 -# with: -# path: logs/ -# name: logs +on: + workflow_run: + workflows: ["release-minor-trigger"] + types: + - completed + +jobs: + build: + name: Test + runs-on: ${{ matrix.os }} + strategy: + max-parallel: 2 + fail-fast: false + matrix: + build: [linux-release, windows-release, osx-release] + include: + - build: linux-release + os: ubuntu-latest + config: release + - build: osx-release + os: macos-latest + config: release + - build: windows-release + os: windows-2019 + config: release + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 7.0.x + 8.0.x + - name: Cache Packages + uses: actions/cache@v4 + with: + key: "unit_test_models" + path: LLama.Unittest/Models + # workaround for actions/setup-dotnet#155 + - name: Clear package cache + run: dotnet clean LLamaSharp.sln && dotnet nuget locals all --clear + - name: Restore packages + run: dotnet restore LLamaSharp.sln + - name: Build + run: dotnet build LLamaSharp.sln -c ${{ matrix.config }} --no-restore + - name: Test + run: dotnet test LLamaSharp.sln -c ${{ matrix.config }} -l "console;verbosity=detailed" --diag:logs/log.txt + - name: Upload artifacts + if: always() + uses: actions/upload-artifact@v3 + with: + path: logs/ + name: logs From c90f97021b26b16e634048ba839b178c1efcb982 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 21:13:15 +0800 Subject: [PATCH 03/23] fix ci --- .github/workflows/release-patch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 7d99ed0c..b036ba28 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -10,6 +10,7 @@ on: pull_request: branches: - master + types: [ opened ] env: NUGET_API_TOKEN: ${{ secrets.LLAMA_SHARP_NUGET_KEY }} From e63fa778fad9d6c5dc75c798f7c369540e98e7e4 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 21:15:36 +0800 Subject: [PATCH 04/23] trigger workflow on doc_ci branch. --- .github/workflows/release-patch.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index b036ba28..458f664e 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -7,10 +7,9 @@ name: auto-patch-release # - completed on: - pull_request: - branches: - - master - types: [ opened ] + push: + branches: + - 'doc_ci' env: NUGET_API_TOKEN: ${{ secrets.LLAMA_SHARP_NUGET_KEY }} From ae24be0215884bc89e260f5801022f368655a0c0 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 21:16:23 +0800 Subject: [PATCH 05/23] fix ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 458f664e..b777a39e 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -16,7 +16,7 @@ env: jobs: patch_release_to_nuget: - if: ${{ github.event.workflow_run.conclusion == 'success' }} + # if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: From 47bf9a8f668e32c1a9d2b4ff2e6fc18180a9219d Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 21:54:40 +0800 Subject: [PATCH 06/23] fix ci --- .github/workflows/release-patch.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index b777a39e..1dafcfa4 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -20,7 +20,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Configure Git Credentials + run: | + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com - name: Setup NuGet uses: nuget/setup-nuget@v1 with: From 4f56e7297f6d1244c8eab0bc5d12763715ddcde7 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 22:11:56 +0800 Subject: [PATCH 07/23] fix ci --- .github/workflows/release-patch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 1dafcfa4..a2f83f3d 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -21,10 +21,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Configure Git Credentials - run: | - git config user.name github-actions[bot] - git config user.email 41898282+github-actions[bot]@users.noreply.github.com + - name: Configure Git Credentials + run: | + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com - name: Setup NuGet uses: nuget/setup-nuget@v1 with: From 66eb09b816b36a0fafeaa5189351b079001cb26e Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 22:35:15 +0800 Subject: [PATCH 08/23] fix ci --- .github/workflows/release-patch.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index a2f83f3d..c88a8950 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -72,7 +72,6 @@ jobs: restore-keys: | mkdocs-material- - run: pip install mkdocs-material - - run: mkdocs gh-deploy --force - run: | version=$(cat ./temp/LLamaSharp.version) mike deploy --push --update-aliases $version latest From 9b0850f0665088c7a497a7afd60c5cc04605c1fc Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 22:37:42 +0800 Subject: [PATCH 09/23] fix ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index c88a8950..10df7e73 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -73,7 +73,7 @@ jobs: mkdocs-material- - run: pip install mkdocs-material - run: | - version=$(cat ./temp/LLamaSharp.version) + version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest mike set-default --push latest From 53d68ca0755d904f5680c5f2dc3272a0d29bacba Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 22:41:41 +0800 Subject: [PATCH 10/23] fix ci --- .github/workflows/release-patch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 10df7e73..c0f06e40 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -72,6 +72,7 @@ jobs: restore-keys: | mkdocs-material- - run: pip install mkdocs-material + - run: pip install mike - run: | version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest From 76be9736890538a5d6bd56ee06893196086c7f24 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 23:33:24 +0800 Subject: [PATCH 11/23] fix doc ci --- .github/workflows/release-patch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index c0f06e40..6860862c 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -23,8 +23,8 @@ jobs: - uses: actions/checkout@v4 - name: Configure Git Credentials run: | - git config user.name github-actions[bot] - git config user.email 41898282+github-actions[bot]@users.noreply.github.com + git config user.name Rinne + git config user.email AsakusaRinne@gmail.com - name: Setup NuGet uses: nuget/setup-nuget@v1 with: @@ -71,9 +71,9 @@ jobs: path: .cache restore-keys: | mkdocs-material- - - run: pip install mkdocs-material - - run: pip install mike + - run: pip install mkdocs mkdocs-material mike - run: | + git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest mike set-default --push latest From cb8129552415cae1f4370efb132a773a96532ff3 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 23:39:08 +0800 Subject: [PATCH 12/23] fix doc ci --- .github/workflows/release-patch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 6860862c..a216fd19 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -73,6 +73,8 @@ jobs: mkdocs-material- - run: pip install mkdocs mkdocs-material mike - run: | + token=${{ github.token }} + git remote set-url origin $"https://{token}@github.com/AsakusaRinne/LLamaSharp.git" git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest From 8be9e8ae70437d0ceebd8964188e31751ae22349 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 23:41:32 +0800 Subject: [PATCH 13/23] fix doc ci --- .github/workflows/release-patch.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index a216fd19..93091592 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -73,8 +73,7 @@ jobs: mkdocs-material- - run: pip install mkdocs mkdocs-material mike - run: | - token=${{ github.token }} - git remote set-url origin $"https://{token}@github.com/AsakusaRinne/LLamaSharp.git" + git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/AsakusaRinne/LLamaSharp.git git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest From 0773e68111e8f23bd6916fc38f53b0f0224d7a50 Mon Sep 17 00:00:00 2001 From: Rinne Date: Sun, 31 Mar 2024 23:47:17 +0800 Subject: [PATCH 14/23] fix doc ci --- .github/workflows/release-patch.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 93091592..6860862c 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -73,7 +73,6 @@ jobs: mkdocs-material- - run: pip install mkdocs mkdocs-material mike - run: | - git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/AsakusaRinne/LLamaSharp.git git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest From b70115f37dfaa040a31fde5f5d64c4392c9f0dca Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:10:09 +0800 Subject: [PATCH 15/23] fix doc ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 6860862c..f4a02e24 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -75,6 +75,6 @@ jobs: - run: | git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) - mike deploy --push --update-aliases $version latest + mike deploy $version mike set-default --push latest From a47c3a01bf45e87552dffa4105b314c390f030c2 Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:19:23 +0800 Subject: [PATCH 16/23] fix doc ci --- .github/workflows/release-patch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index f4a02e24..11a366e4 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -75,6 +75,6 @@ jobs: - run: | git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) - mike deploy $version - mike set-default --push latest + mike deploy --push --update-aliases $version latest --force + mike set-default --push latest --force From 448fd37c75968f7a5fd0c13522c44ec3d25ed3c7 Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:22:51 +0800 Subject: [PATCH 17/23] fix doc ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 11a366e4..b0d76d79 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -76,5 +76,5 @@ jobs: git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) mike deploy --push --update-aliases $version latest --force - mike set-default --push latest --force + mike set-default --push latest From 7a8fd4f88f4cc3b8226a7c3c6782df3c82a87068 Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:28:35 +0800 Subject: [PATCH 18/23] fix doc ci --- .github/workflows/release-patch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index b0d76d79..5b62dc81 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -75,6 +75,6 @@ jobs: - run: | git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) - mike deploy --push --update-aliases $version latest --force - mike set-default --push latest + mike deploy --push --update-aliases --force $version latest + mike set-default --push --force latest From 833b2d3abffcc6852be1af8567ad2c8c7cd78cbc Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:32:07 +0800 Subject: [PATCH 19/23] fix doc ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 5b62dc81..93dd274e 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -71,7 +71,7 @@ jobs: path: .cache restore-keys: | mkdocs-material- - - run: pip install mkdocs mkdocs-material mike + - run: pip install mkdocs mkdocs-material mike==1.1.2 - run: | git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) From 3b5713a38ad19f47e95919707ac60276177a98ad Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:37:42 +0800 Subject: [PATCH 20/23] fix doc ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 93dd274e..95ae9d9d 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -71,7 +71,7 @@ jobs: path: .cache restore-keys: | mkdocs-material- - - run: pip install mkdocs mkdocs-material mike==1.1.2 + - run: pip install mkdocs==1.4.3 mkdocs-material mike==1.1.2 pkg_resources - run: | git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) From 7e69ee9ce1e48308e365611b0525e37f28d0f190 Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:42:46 +0800 Subject: [PATCH 21/23] fix doc ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 95ae9d9d..2ba9080a 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -71,7 +71,7 @@ jobs: path: .cache restore-keys: | mkdocs-material- - - run: pip install mkdocs==1.4.3 mkdocs-material mike==1.1.2 pkg_resources + - run: pip install mkdocs==1.4.3 mkdocs-material mike==1.1.2 setuptools - run: | git fetch origin gh-pages --depth=1 version=$(cat ./temp/version.txt) From e89ca042b3214f641884cf6f3131405771d36552 Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 00:52:24 +0800 Subject: [PATCH 22/23] fix doc ci --- .github/workflows/release-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 2ba9080a..561a61ea 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -74,7 +74,7 @@ jobs: - run: pip install mkdocs==1.4.3 mkdocs-material mike==1.1.2 setuptools - run: | git fetch origin gh-pages --depth=1 - version=$(cat ./temp/version.txt) + version=$(cat ./temp/version.txt | sed 's/.$/2/') mike deploy --push --update-aliases --force $version latest mike set-default --push --force latest From 55648a6ecdc0f4ab726358da55b9782f489854a2 Mon Sep 17 00:00:00 2001 From: Rinne Date: Mon, 1 Apr 2024 01:22:02 +0800 Subject: [PATCH 23/23] complete doc ci. --- .github/workflows/main.yml | 20 +++++++------------- .github/workflows/release-minor.yml | 25 ++++++++++++++++++++++++- .github/workflows/release-patch.yml | 22 +++++++++------------- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 189fdcde..26d35207 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,18 +1,12 @@ name: CI -# on: -# push: -# branches: [master] -# pull_request: -# branches: [master] -# concurrency: -# group: ${{ github.workflow }}-${{ github.ref }} -# cancel-in-progress: true - on: - workflow_run: - workflows: ["release-minor-trigger"] - types: - - completed + push: + branches: [master] + pull_request: + branches: [master] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: build: diff --git a/.github/workflows/release-minor.yml b/.github/workflows/release-minor.yml index e6fed26c..59be40c9 100644 --- a/.github/workflows/release-minor.yml +++ b/.github/workflows/release-minor.yml @@ -15,7 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Configure Git Credentials + run: | + git config user.name Rinne + git config user.email AsakusaRinne@gmail.com - name: Setup NuGet uses: nuget/setup-nuget@v1 with: @@ -51,3 +55,22 @@ jobs: - name: Push LLamaSharp packages to nuget.org run: dotnet nuget push ./temp/LLamaSharp*.nupkg --source https://www.nuget.org -k ${{ secrets.LLAMA_SHARP_NUGET_KEY }} --skip-duplicate + + # Deploy the documentation to GitHub Pages + - uses: actions/setup-python@v5 + with: + python-version: 3.x + - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV + - uses: actions/cache@v4 + with: + key: mkdocs-material-${{ env.cache_id }} + path: .cache + restore-keys: | + mkdocs-material- + - run: pip install mkdocs==1.4.3 mkdocs-material mike==1.1.2 setuptools + - run: | + git fetch origin gh-pages --depth=1 + version=$(cat ./temp/version.txt) + mike deploy --push --update-aliases --force $version latest + mike set-default --push --force latest + \ No newline at end of file diff --git a/.github/workflows/release-patch.yml b/.github/workflows/release-patch.yml index 561a61ea..f3533b95 100644 --- a/.github/workflows/release-patch.yml +++ b/.github/workflows/release-patch.yml @@ -1,22 +1,17 @@ name: auto-patch-release -# on: -# workflow_run: -# workflows: ["release-patch-trigger"] -# types: -# - completed - on: - push: - branches: - - 'doc_ci' + workflow_run: + workflows: ["release-patch-trigger"] + types: + - completed env: NUGET_API_TOKEN: ${{ secrets.LLAMA_SHARP_NUGET_KEY }} jobs: patch_release_to_nuget: - # if: ${{ github.event.workflow_run.conclusion == 'success' }} + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest steps: @@ -58,9 +53,10 @@ jobs: name: "drop-ci-packages" path: './temp' - # - name: Push LLamaSharp packages to nuget.org - # run: dotnet nuget push ./temp/LLamaSharp*.nupkg --source https://www.nuget.org -k ${{ secrets.LLAMA_SHARP_NUGET_KEY }} --skip-duplicate + - name: Push LLamaSharp packages to nuget.org + run: dotnet nuget push ./temp/LLamaSharp*.nupkg --source https://www.nuget.org -k ${{ secrets.LLAMA_SHARP_NUGET_KEY }} --skip-duplicate + # Deploy the documentation to GitHub Pages - uses: actions/setup-python@v5 with: python-version: 3.x @@ -74,7 +70,7 @@ jobs: - run: pip install mkdocs==1.4.3 mkdocs-material mike==1.1.2 setuptools - run: | git fetch origin gh-pages --depth=1 - version=$(cat ./temp/version.txt | sed 's/.$/2/') + version=$(cat ./temp/version.txt) mike deploy --push --update-aliases --force $version latest mike set-default --push --force latest