diff --git a/.github/workflows/openmw.yml b/.github/workflows/push.yml similarity index 90% rename from .github/workflows/openmw.yml rename to .github/workflows/push.yml index f29155007c..2e85fedafc 100644 --- a/.github/workflows/openmw.yml +++ b/.github/workflows/push.yml @@ -6,10 +6,12 @@ on: env: BUILD_TYPE: RelWithDebInfo - VCPKG_DEPS_TAG: 2024-11-10 jobs: Ubuntu: + # TODO remove + if: false + runs-on: ubuntu-latest steps: @@ -68,6 +70,9 @@ jobs: # name: build_artifact.7z MacOS: + # TODO remove + if: false + runs-on: macos-latest steps: @@ -89,17 +94,20 @@ jobs: cd build make -j $(sysctl -n hw.logicalcpu) package - # This is a fairly silly job to work around `env` not being available in `with` Output-Envs: - name: Pass environment variables along + name: Read .env file and expose it as output runs-on: ubuntu-latest outputs: VCPKG_DEPS_TAG: ${{ env.VCPKG_DEPS_TAG }} BUILD_TYPE: ${{ env.BUILD_TYPE }} steps: - - run: echo "Doing nothing" + - uses: actions/checkout@v2 + - run: cat "${{ github.workspace }}/CI/github.env" >> $GITHUB_ENV Windows: + # TODO remove + if: false + needs: - Output-Envs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..67551d6c0b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,24 @@ +name: Release + +on: + - push + +jobs: + Output-Envs: + name: Read .env file and expose it as output + runs-on: ubuntu-latest + outputs: + VCPKG_DEPS_TAG: ${{ env.VCPKG_DEPS_TAG }} + steps: + - uses: actions/checkout@v2 + - run: cat "${{ github.workspace }}/CI/github.env" >> $GITHUB_ENV + + Windows: + needs: + - Output-Envs + uses: ./.github/workflows/windows.yml + with: + image: "2022" + vcpkg-deps-tag: ${{ needs.Output-Envs.outputs.VCPKG_DEPS_TAG }} + build-type: Release + package: true diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 11439d9429..45706e4ffc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,6 +14,9 @@ on: build-type: default: RelWithDebInfo type: string + package: + default: false + type: boolean jobs: Windows: @@ -166,19 +169,25 @@ jobs: run: echo '${{ github.workspace }}/install' >> ${GITHUB_PATH} - name: Run components tests + if: ${{ ! inputs.package }} run: build/components-tests.exe - name: Run OpenMW tests + if: ${{ ! inputs.package }} run: build/openmw-tests.exe - name: Run OpenMW-CS tests + if: ${{ ! inputs.package }} run: build/openmw-cs-tests.exe - name: Run detournavigator navmeshtilescache benchmark + if: ${{ ! inputs.package }} run: build/openmw_detournavigator_navmeshtilescache_benchmark.exe - name: Run settings access benchmark + if: ${{ ! inputs.package }} run: build/openmw_settings_access_benchmark.exe - name: Run esm refid benchmark + if: ${{ ! inputs.package }} run: build/openmw_esm_refid_benchmark.exe diff --git a/CI/github.env b/CI/github.env new file mode 100644 index 0000000000..d8ca8b429f --- /dev/null +++ b/CI/github.env @@ -0,0 +1 @@ +VCPKG_DEPS_TAG=2024-11-10