diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 135f2a47..793308d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: jobs: cloc: name: CLOC - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f @@ -27,7 +27,7 @@ jobs: setup: name: Setup - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: package_version: ${{ steps.get_version.outputs.package_version }} steps: @@ -44,7 +44,7 @@ jobs: cli: name: CLI - runs-on: windows-latest + runs-on: windows-2019 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} @@ -191,16 +191,11 @@ jobs: windows_gui: name: Windows GUI - runs-on: windows-latest + runs-on: windows-2019 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} steps: - - name: Set up dotnet - uses: actions/setup-dotnet@a71d1eb2c86af85faa8c772c03fb365e377e45ea - with: - dotnet-version: "3.1.x" - - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: @@ -223,24 +218,7 @@ jobs: dotnet --version - name: Install AST - shell: pwsh - run: | - cd $HOME - - git clone https://github.com/vcsjones/AzureSignTool.git - cd AzureSignTool - $latest_head = $(git rev-parse HEAD)[0..9] -join "" - $latest_version = "0.0.0-g$latest_head" - - Write-Host "--------" - Write-Host "git commit - $(git rev-parse HEAD)" - Write-Host "latest_head - $latest_head" - Write-Host "PACKAGE VERSION TO BUILD - $latest_version" - Write-Host "--------" - - dotnet restore - dotnet pack --output ./nupkg - dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool + uses: bitwarden/gh-actions/install-ast@f135c42c8596cb535c5bcb7523c0b2eef89709ac - name: Checkout repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f @@ -279,7 +257,7 @@ jobs: linux: name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} @@ -325,7 +303,7 @@ jobs: macos: name: MacOS - runs-on: macos-latest + runs-on: macos-11 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24c58815..91adda15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: jobs: setup: name: Setup - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: package_version: ${{ steps.create_tags.outputs.package_version }} tag_version: ${{ steps.create_tags.outputs.tag_version }} @@ -66,7 +66,7 @@ jobs: cli: name: CLI - runs-on: windows-latest + runs-on: windows-2019 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} @@ -237,16 +237,11 @@ jobs: windows-gui: name: Windows GUI - runs-on: windows-latest + runs-on: windows-2019 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} steps: - - name: Set up dotnet - uses: actions/setup-dotnet@a71d1eb2c86af85faa8c772c03fb365e377e45ea - with: - dotnet-version: "3.1.x" - - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: @@ -269,22 +264,7 @@ jobs: dotnet --version - name: Install AST - shell: pwsh - run: | - cd $HOME - git clone https://github.com/vcsjones/AzureSignTool.git - cd AzureSignTool - $latest_head = $(git rev-parse HEAD)[0..9] -join "" - $latest_version = "0.0.0-g$latest_head" - Write-Host "--------" - Write-Host "git commit - $(git rev-parse HEAD)" - Write-Host "latest_head - $latest_head" - Write-Host "PACKAGE VERSION TO BUILD - $latest_version" - Write-Host "--------" - dotnet restore - dotnet pack --output ./nupkg - dotnet tool install --global --ignore-failed-sources --add-source ./nupkg --version $latest_version azuresigntool - cd $HOME + uses: bitwarden/gh-actions/install-ast@f135c42c8596cb535c5bcb7523c0b2eef89709ac - name: Checkout repo uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f @@ -313,7 +293,7 @@ jobs: linux: name: Linux - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }} @@ -362,7 +342,7 @@ jobs: macos: name: MacOS - runs-on: macos-latest + runs-on: macos-11 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}