From 58e1a19805f74d537e7d631de40c5b0a1a062ed4 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 21 Jan 2024 09:59:34 -0500 Subject: [PATCH] Trim win builds --- .github/workflows/release.yml | 125 +--------------------------------- releaseVersion | 2 +- src/runnerversion | 2 +- 3 files changed, 3 insertions(+), 126 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7fb0d53c0f4..1557257eeb9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,19 +48,15 @@ jobs: outputs: linux-x64-sha: ${{ steps.sha.outputs.linux-x64-sha256 }} linux-arm64-sha: ${{ steps.sha.outputs.linux-arm64-sha256 }} - win-x64-sha: ${{ steps.sha.outputs.win-x64-sha256 }} linux-x64-sha-noexternals: ${{ steps.sha_noexternals.outputs.linux-x64-sha256 }} linux-arm64-sha-noexternals: ${{ steps.sha_noexternals.outputs.linux-arm64-sha256 }} - win-x64-sha-noexternals: ${{ steps.sha_noexternals.outputs.win-x64-sha256 }} linux-x64-sha-noruntime: ${{ steps.sha_noruntime.outputs.linux-x64-sha256 }} linux-arm64-sha-noruntime: ${{ steps.sha_noruntime.outputs.linux-arm64-sha256 }} - win-x64-sha-noruntime: ${{ steps.sha_noruntime.outputs.win-x64-sha256 }} linux-x64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.linux-x64-sha256 }} linux-arm64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.linux-arm64-sha256 }} - win-x64-sha-noruntime-noexternals: ${{ steps.sha_noruntime_noexternals.outputs.win-x64-sha256 }} strategy: matrix: - runtime: [ linux-x64, linux-arm64, win-x64 ] + runtime: [ linux-x64, linux-arm64 ] include: - runtime: linux-x64 os: ubuntu-latest @@ -70,14 +66,6 @@ jobs: os: ubuntu-latest devScript: ./dev.sh - - runtime: win-x64 - os: windows-2019 - devScript: ./dev - - - runtime: win-arm64 - os: windows-latest - devScript: ./dev - runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -144,8 +132,6 @@ jobs: const fs = require('fs'); const runnerVersion = fs.readFileSync('${{ github.workspace }}/src/runnerversion', 'utf8').replace(/\n$/g, '') var releaseNote = fs.readFileSync('${{ github.workspace }}/releaseNote.md', 'utf8').replace(//g, runnerVersion) - releaseNote = releaseNote.replace(//g, '${{needs.build.outputs.win-x64-sha}}') - releaseNote = releaseNote.replace(//g, '${{needs.build.outputs.win-arm64-sha}}') releaseNote = releaseNote.replace(//g, '${{needs.build.outputs.osx-x64-sha}}') releaseNote = releaseNote.replace(//g, '${{needs.build.outputs.osx-arm64-sha}}') releaseNote = releaseNote.replace(//g, '${{needs.build.outputs.linux-x64-sha}}') @@ -158,7 +144,6 @@ jobs: - name: Validate Packages HASH run: | ls -l - echo "${{needs.build.outputs.win-x64-sha}} actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip" | shasum -a 256 -c echo "${{needs.build.outputs.linux-x64-sha}} actions-runner-linux-x64-${{ steps.releaseNote.outputs.version }}.tar.gz" | shasum -a 256 -c echo "${{needs.build.outputs.linux-arm64-sha}} actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz" | shasum -a 256 -c @@ -175,26 +160,6 @@ jobs: ${{ steps.releaseNote.outputs.note }} # Upload release assets (full runner packages) - - name: Upload Release Asset (win-x64) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip - asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}.zip - asset_content_type: application/octet-stream - - - name: Upload Release Asset (win-arm64) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}.zip - asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset (linux-x64) uses: actions/upload-release-asset@v1.0.1 env: @@ -215,28 +180,6 @@ jobs: asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}.tar.gz asset_content_type: application/octet-stream - # Upload release assets (trim externals) - - name: Upload Release Asset (win-x64-noexternals) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/_package_trims/trim_externals/actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noexternals.zip - asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noexternals.zip - asset_content_type: application/octet-stream - - # Upload release assets (trim externals) - - name: Upload Release Asset (win-arm64-noexternals) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/_package_trims/trim_externals/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noexternals.zip - asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noexternals.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset (linux-x64-noexternals) uses: actions/upload-release-asset@v1.0.1 env: @@ -257,28 +200,6 @@ jobs: asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}-noexternals.tar.gz asset_content_type: application/octet-stream - # Upload release assets (trim runtime) - - name: Upload Release Asset (win-x64-noruntime) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/_package_trims/trim_runtime/actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noruntime.zip - asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noruntime.zip - asset_content_type: application/octet-stream - - # Upload release assets (trim runtime) - - name: Upload Release Asset (win-arm64-noruntime) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/_package_trims/trim_runtime/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime.zip - asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset (linux-x64-noruntime) uses: actions/upload-release-asset@v1.0.1 env: @@ -299,28 +220,6 @@ jobs: asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}-noruntime.tar.gz asset_content_type: application/octet-stream - # Upload release assets (trim runtime and externals) - - name: Upload Release Asset (win-x64-noruntime-noexternals) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/_package_trims/trim_runtime_externals/actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip - asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip - asset_content_type: application/octet-stream - - # Upload release assets (trim runtime and externals) - - name: Upload Release Asset (win-arm64-noruntime-noexternals) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/_package_trims/trim_runtime_externals/actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip - asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.zip - asset_content_type: application/octet-stream - - name: Upload Release Asset (linux-x64-noruntime-noexternals) uses: actions/upload-release-asset@v1.0.1 env: @@ -341,28 +240,6 @@ jobs: asset_name: actions-runner-linux-arm64-${{ steps.releaseNote.outputs.version }}-noruntime-noexternals.tar.gz asset_content_type: application/octet-stream - # Upload release assets (trimmedpackages.json) - - name: Upload Release Asset (win-x64-trimmedpackages.json) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/win-x64-trimmedpackages.json - asset_name: actions-runner-win-x64-${{ steps.releaseNote.outputs.version }}-trimmedpackages.json - asset_content_type: application/octet-stream - - # Upload release assets (trimmedpackages.json) - - name: Upload Release Asset (win-arm64-trimmedpackages.json) - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createRelease.outputs.upload_url }} - asset_path: ${{ github.workspace }}/win-arm64-trimmedpackages.json - asset_name: actions-runner-win-arm64-${{ steps.releaseNote.outputs.version }}-trimmedpackages.json - asset_content_type: application/octet-stream - - name: Upload Release Asset (linux-x64-trimmedpackages.json) uses: actions/upload-release-asset@v1.0.1 env: diff --git a/releaseVersion b/releaseVersion index 5917648a460..2056d51af41 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.312.0-rust1 +2.312.0-rust2 diff --git a/src/runnerversion b/src/runnerversion index 5917648a460..2056d51af41 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.312.0-rust1 +2.312.0-rust2