diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b9f66d85c..991d6cac3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,9 @@ name: Build on: - pull_request: + push: + branches: + - never concurrency: group: ci-build-${{ github.ref }}-1 diff --git a/.github/workflows/build_dev_version.yml b/.github/workflows/build_dev_version.yml index bdc8f3f5d..a63ed08b7 100644 --- a/.github/workflows/build_dev_version.yml +++ b/.github/workflows/build_dev_version.yml @@ -1,46 +1,27 @@ name: Build development version on: - push: - branches: - - 'master' + pull_request: jobs: - remove_old_artifacts: - name: Remove old artifacts - runs-on: ubuntu-latest - steps: - - name: Remove old artifacts - uses: kolpav/purge-artifacts-action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - expire-in: 0 - - upload_dev_build_artifact: name: Upload development build - needs: remove_old_artifacts runs-on: ${{ matrix.os }} strategy: matrix: build: - win-x64 - - linux-x64 include: - build: win-x64 os: windows-latest archive_type: zip archive_extension: .zip - - build: linux-x64 - os: ubuntu-latest - archive_type: tar - archive_extension: .tgz steps: - uses: actions/checkout@v3 with: fetch-depth: 0 submodules: recursive - name: "Setup Dotnet for use with actions" - uses: actions/setup-dotnet@v3 + uses: ./setup-dotnet with: global-json-file: Fronter.NET/global.json - name: "Build frontend" @@ -49,7 +30,7 @@ jobs: fronter_dir: 'Fronter.NET' release_dir: 'Publish' - name: Setup Dotnet for use with actions - uses: actions/setup-dotnet@v3 + uses: ./setup-dotnet with: global-json-file: global.json - name: "Build backend" diff --git a/.github/workflows/find_braces_mismatches.yml b/.github/workflows/find_braces_mismatches.yml index d61008d0b..596ff5dfe 100644 --- a/.github/workflows/find_braces_mismatches.yml +++ b/.github/workflows/find_braces_mismatches.yml @@ -1,5 +1,8 @@ name: "Find braces mismatches" -on: [push] +on: + push: + branches: + - never jobs: find_braces_mismatches: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f01aec531..715a8ba36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,9 @@ name: "Test" on: - pull_request: + push: + branches: + - never concurrency: group: ci-tests-${{ github.ref }}-1 diff --git a/.gitmodules b/.gitmodules index 458313045..5ce1ae157 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "IR-CK3_TFE-Islam"] path = RiseOfIslam url = https://github.com/TinWiz/IR-CK3_TFE-Islam +[submodule "setup-dotnet"] + path = setup-dotnet + url = git@github.com:nikolai-laevskii/setup-dotnet.git diff --git a/Fronter.NET b/Fronter.NET index fce4c879d..eee3523c6 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit fce4c879df2f684df95c7102eba4f28367db4d63 +Subproject commit eee3523c69882af903786eae30e76ac9473c14ff diff --git a/setup-dotnet b/setup-dotnet new file mode 160000 index 000000000..22431176b --- /dev/null +++ b/setup-dotnet @@ -0,0 +1 @@ +Subproject commit 22431176b4f0874b2209deaa3a50d8706c6fa881