diff options
| -rw-r--r-- | .github/workflows/create_release.yml | 15 | ||||
| -rw-r--r-- | .github/workflows/validate.yml | 15 | ||||
| -rw-r--r-- | xmake.lua | 1 |
3 files changed, 13 insertions, 18 deletions
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 1d87a7153..658b6b648 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -1,4 +1,7 @@ name: Create Release +env: + VCPKG_VERSION: 2023.07.21 + XMAKE_VERSION: 2.8.2 # 2.8.3 breaks fetching of asio package on MacOS ARM on: push: @@ -9,8 +12,6 @@ jobs: bundle-windows: runs-on: [self-hosted, windows, x64] timeout-minutes: 25 - env: - VCPKG_VERSION: 2023.07.21 steps: - uses: actions/checkout@v3 @@ -18,7 +19,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: 2.8.1 + xmake-version: ${{env.XMAKE_VERSION}} - name: Installing vcpkg run: | @@ -60,8 +61,6 @@ jobs: bundle-linux: runs-on: [self-hosted, linux, x64] timeout-minutes: 25 - env: - VCPKG_VERSION: 2023.07.21 steps: - uses: actions/checkout@v3 @@ -74,7 +73,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: branch@dev # We need a fix for versioning sentry-native which is not available as of 2.8.1 + xmake-version: ${{env.XMAKE_VERSION}} - name: Installing vcpkg run: | @@ -122,8 +121,6 @@ jobs: bundle-macos: runs-on: [self-hosted, macos, x64] timeout-minutes: 25 - env: - VCPKG_VERSION: 2023.07.21 steps: - uses: actions/checkout@v3 @@ -131,7 +128,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: 2.8.1 + xmake-version: ${{env.XMAKE_VERSION}} - name: Installing vcpkg run: | diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 9b455c335..0960882d6 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -1,4 +1,7 @@ name: Validate +env: + VCPKG_VERSION: 2023.07.21 + XMAKE_VERSION: 2.8.2 # 2.8.3 breaks fetching of asio package on MacOS ARM on: pull_request: @@ -52,8 +55,6 @@ jobs: - 'release' arch: - 'x64' - env: - VCPKG_VERSION: 2023.07.21 steps: - name: Checkout @@ -62,7 +63,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: 2.8.1 + xmake-version: ${{env.XMAKE_VERSION}} - name: Installing vcpkg run: | # Remove-Item -Recurse .vcpkg @@ -118,8 +119,6 @@ jobs: - 'release' arch: - 'x86_64' - env: - VCPKG_VERSION: 2023.07.21 steps: - name: Checkout @@ -133,7 +132,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: branch@dev # We need a fix for versioning sentry-native which is not available as of 2.8.1 + xmake-version: ${{env.XMAKE_VERSION}} - name: Installing vcpkg run: | # rm -rf .vcpkg @@ -188,8 +187,6 @@ jobs: - 'release' arch: - 'x86_64' - env: - VCPKG_VERSION: 2023.07.21 steps: - name: Checkout @@ -198,7 +195,7 @@ jobs: - name: Setup xmake uses: xmake-io/github-action-setup-xmake@v1 with: - xmake-version: 2.8.1 + xmake-version: ${{env.XMAKE_VERSION}} - name: Installing vcpkg run: | # rm -rf .vcpkg @@ -256,6 +256,7 @@ task("test") if name == "server" then cmd = string.format("xmake run %s test", test) end + cmd = string.format("%s --duration=true", cmd) if use_junit_reporting then local target = project.target(test) local junit_report_file = path.join(junit_report_dir, string.format("junit-%s-%s-%s.xml", config.plat(), arch, test)) |