From c2f4d3c64bc8972a4db2f445f2e27b70c8e3b4d6 Mon Sep 17 00:00:00 2001 From: DomCR Date: Thu, 15 Aug 2024 13:11:33 +0200 Subject: [PATCH 1/4] build --- .github/workflows/build.yml | 2 +- .github/workflows/wiki-gen.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa041c85..fb6ede70 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 - with: + with: submodules: true - name: Restore dependencies and Build working-directory: src diff --git a/.github/workflows/wiki-gen.yml b/.github/workflows/wiki-gen.yml index 08448b48..9bd08deb 100644 --- a/.github/workflows/wiki-gen.yml +++ b/.github/workflows/wiki-gen.yml @@ -3,6 +3,8 @@ name: Wiki genrator on: push: branches: [ master ] + pull_request: + branches: [ master ] jobs: build: @@ -16,6 +18,7 @@ jobs: - name: Update Wiki run: ./update-wiki.sh shell: bash + working-directory: ./src env: ASSEMBLY_PATH: "src/ACadSharp/bin/Release/net6.0/ACadSharp.dll" GITHUB_TOKEN: ${{ github.token }} From 58bc440d3c8aefdaf74cf75e627b0a3f1e7cd950 Mon Sep 17 00:00:00 2001 From: DomCR Date: Thu, 15 Aug 2024 13:14:15 +0200 Subject: [PATCH 2/4] script path --- .github/workflows/wiki-gen.yml | 1 - update-wiki.sh | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wiki-gen.yml b/.github/workflows/wiki-gen.yml index 9bd08deb..37be5e11 100644 --- a/.github/workflows/wiki-gen.yml +++ b/.github/workflows/wiki-gen.yml @@ -18,7 +18,6 @@ jobs: - name: Update Wiki run: ./update-wiki.sh shell: bash - working-directory: ./src env: ASSEMBLY_PATH: "src/ACadSharp/bin/Release/net6.0/ACadSharp.dll" GITHUB_TOKEN: ${{ github.token }} diff --git a/update-wiki.sh b/update-wiki.sh index 3d46e34d..7ce38b48 100644 --- a/update-wiki.sh +++ b/update-wiki.sh @@ -1,6 +1,8 @@ #!/bin/sh set -eu +cd ./src + echo "Restore project" dotnet restore @@ -10,6 +12,8 @@ dotnet tool restore echo "Build project" dotnet build --configuration Release --no-restore +cd .. + TMP_WORK_DIR="tmp-$GITHUB_SHA" WIKI_REPO_DIR="wiki-repo" From c1442a30f1f58d993e34e33699dbcb21b0ea3b96 Mon Sep 17 00:00:00 2001 From: DomCR Date: Thu, 15 Aug 2024 13:22:41 +0200 Subject: [PATCH 3/4] path --- .github/workflows/wiki-gen.yml | 2 +- update-wiki.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/wiki-gen.yml b/.github/workflows/wiki-gen.yml index 37be5e11..5e707077 100644 --- a/.github/workflows/wiki-gen.yml +++ b/.github/workflows/wiki-gen.yml @@ -19,5 +19,5 @@ jobs: run: ./update-wiki.sh shell: bash env: - ASSEMBLY_PATH: "src/ACadSharp/bin/Release/net6.0/ACadSharp.dll" + ASSEMBLY_PATH: "ACadSharp/bin/Release/net6.0/ACadSharp.dll" GITHUB_TOKEN: ${{ github.token }} diff --git a/update-wiki.sh b/update-wiki.sh index 7ce38b48..ad9e9009 100644 --- a/update-wiki.sh +++ b/update-wiki.sh @@ -12,8 +12,6 @@ dotnet tool restore echo "Build project" dotnet build --configuration Release --no-restore -cd .. - TMP_WORK_DIR="tmp-$GITHUB_SHA" WIKI_REPO_DIR="wiki-repo" From be3e82b737926e62ffce1ad159df7bb5589ec74d Mon Sep 17 00:00:00 2001 From: DomCR Date: Thu, 15 Aug 2024 13:31:59 +0200 Subject: [PATCH 4/4] only on merge --- .github/workflows/wiki-gen.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/wiki-gen.yml b/.github/workflows/wiki-gen.yml index 5e707077..3d6b5ab8 100644 --- a/.github/workflows/wiki-gen.yml +++ b/.github/workflows/wiki-gen.yml @@ -3,8 +3,6 @@ name: Wiki genrator on: push: branches: [ master ] - pull_request: - branches: [ master ] jobs: build: