From 8fd56c87c2b2939724e655f387fa143a2bf47db0 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 5 Jan 2021 17:23:12 +0000 Subject: [PATCH 1/4] moving dotnet set up --- .github/workflows/build-and-sign.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index 6c0465cd16d..8fbece4d1b3 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -7,6 +7,11 @@ jobs: windows: runs-on: windows-latest steps: + - name: Set up dotnet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "3.x" + - name: Set up Node uses: actions/setup-node@v1 with: @@ -16,11 +21,6 @@ jobs: run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append shell: pwsh - - name: Setup dotnet - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "3.x" - - name: Print environment run: | node --version From 74ba229b2171a87e5b08d5980465d17014fdb1ce Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 5 Jan 2021 17:40:02 +0000 Subject: [PATCH 2/4] switching to version 3.1.x instead of 3.x --- .github/workflows/build-and-sign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index 8fbece4d1b3..d35eea235b4 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -10,7 +10,7 @@ jobs: - name: Set up dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: "3.x" + dotnet-version: "3.1.x" - name: Set up Node uses: actions/setup-node@v1 From 43348c542c09e8a6df471887dcdbb8213fdb834e Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 5 Jan 2021 18:03:23 +0000 Subject: [PATCH 3/4] trying installing AST --- .github/workflows/build-and-sign.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index d35eea235b4..c151d13a947 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -27,13 +27,32 @@ jobs: npm --version dotnet --version - exit 1 + - 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 "--------" + + cd $HOME - name: Checkout repo uses: actions/checkout@v2 - name: Load package version - run: ./.github/scripts/load-version.ps1 + run: | + ./.github/scripts/load-version.ps1 + + exit 1 shell: pwsh - name: Install Node dependencies From 7712f3e8c355d192b707232e00ae3c1950127c80 Mon Sep 17 00:00:00 2001 From: Joseph Flinn Date: Tue, 5 Jan 2021 18:07:53 +0000 Subject: [PATCH 4/4] fixing some whitespace errors --- .github/workflows/build-and-sign.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml index c151d13a947..0fb892b1bc0 100644 --- a/.github/workflows/build-and-sign.yml +++ b/.github/workflows/build-and-sign.yml @@ -32,16 +32,16 @@ jobs: 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" + 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 "--------" + 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 "--------" cd $HOME @@ -51,8 +51,7 @@ jobs: - name: Load package version run: | ./.github/scripts/load-version.ps1 - - exit 1 + exit 1 shell: pwsh - name: Install Node dependencies