Cleanup Windows builds and move windows release build back to GitHub Actions (#5552)

2020-10-12 18:12:12 +01:00 · 2020-10-12 18:12:12 +01:00 · cd518c3516
parent df9c9f195f
commit cd518c3516
5 changed files with 118 additions and 104 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,73 +0,0 @@
-version: 1.0.{build}
-image: Visual Studio 2019
-configuration: Release
-platform: x64
-clone_folder: '%USERPROFILE%\go\src\github.com\pulumi\pulumi'
-branches:
-  only:
-    - master
-    - 'feature-2.0'
-    - /v\d*\.\d*\.\d*/
-environment:
-  PULUMI_API: https://api.pulumi-staging.io
-  PULUMI_ACCESS_TOKEN:
-    secure: +c7s1GgUunQl8QlLZs7zafFv6lJbZp40fx1kJl7v+n0qa8oq3ssBlVEl9gfoMBgH
-  AWS_ACCESS_KEY_ID:
-    secure: eB7Gfl1GHhz60tH2EEASI7IFsWHDd5SV+kponXwaCSo=
-  AWS_SECRET_ACCESS_KEY:
-    secure: T19RJk7Uv3trAChRRDB82OAUDI8k2q9PaSetU7yDFu4aC+MshdwAhTTN/TaPkwl/
-  AWS_REGION: us-west-2
-  ARM_LOCATION: "West US 2"
-  ARM_ENVIRONMENT: public
-  matrix:
-    - nodejs_version: "10.15.3"
-init:
-  - ps: Install-Product node $env:nodejs_version x64
-install:
-  - rmdir C:\go /s /q
-  - appveyor DownloadFile https://dl.google.com/go/go1.15.2.windows-amd64.zip
-  - 7z x go1.15.2.windows-amd64.zip -y -oC:\ > NUL
-  - cmd: >-
-      set GOPATH=%USERPROFILE%\go
-
-      set PATH=C:\go\bin;%PATH%;%GOPATH%\bin
-
-      set PATH=%PATH%;%USERPROFILE%\.yarn\bin
-
-      set PulumiRoot=C:\Pulumi
-
-      set PATH=%PulumiRoot%\bin;%PATH%
-
-      go version
-
-      git clone https://github.com/pulumi/scripts.git "%USERPROFILE%\go\src\github.com\pulumi\scripts"
-
-      set PATH=%PATH%;C:\Python37-x64\Scripts
-
-      pip3 install pyenv-win --target %USERPROFILE%/.pyenv
-
-      set PYENV=%USERPROFILE%\.pyenv\pyenv-win
-
-      set PATH=%PATH%;%PYENV%\bin;%PYENV%\shims
-
-      pip3 install pipenv
-
-      set PULUMI_LOCAL_NUGET=C:\Pulumi\nuget
-
-      set PULUMI_TEST_OWNER=moolumi
-
-      choco install dep
-  - ps: >-
-      New-Item -Type Directory "$env:USERPROFILE\go\bin"
-build_script:
-  - cmd: >-
-      set GO111MODULE=on
-
-      pushd . && cd sdk && go mod tidy && go mod download && popd
-
-      pushd . && cd pkg && go mod tidy && go mod download && popd
-
-      pushd . && cd tests && go mod tidy && go mod download && popd
-
-      .\scripts\release.cmd
-test: off
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@ -4,6 +4,18 @@ on:
      - master
      - feature-*
      - features/*
+    paths-ignore:
+      - 'CHANGELOG.md'
+      - 'README.md'
+
+env:
+  PULUMI_TEST_OWNER: "moolumi"
+  PULUMI_LOCAL_NUGET: "D:\\Pulumi\\nuget"
+  PULUMI_API: "https://api.pulumi-staging.io"
+  PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_LEGACY }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_LEGACY }}
+  GO111MODULE: "on"

 jobs:
  build:
@ -16,8 +28,6 @@ jobs:
        python-version: [3.7]
        dotnet: ['3.1.301']
    runs-on: ${{ matrix.platform }}
-    env:
-      GOPATH: ${{ github.workspace }}
    steps:
    - name: Install DotNet ${{ matrix.dotnet }}
      uses: actions/setup-dotnet@v1
@ -42,18 +52,9 @@ jobs:
    - name: Set Build Env Vars
      shell: bash
      run: |
-        echo "::set-env name=PULUMI_TEST_OWNER::moolumi"
-        echo "::set-env name=PULUMI_LOCAL_NUGET::D:\\Pulumi\\nuget"
-        echo "::set-env name=PULUMI_API::https://api.pulumi-staging.io"
-        echo "::set-env name=PULUMI_ACCESS_TOKEN::${{ secrets.PULUMI_ACCESS_TOKEN }}"
        echo "::add-path::D:\\Pulumi\\bin"
    - name: Install AWS CLI Tools
      uses: chrislennon/action-aws-cli@v1.1
-    - name: Set AWS Env Vars
-      uses: allenevans/set-env@v1.0.0
-      with:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_LEGACY }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_LEGACY }}
    - name: Check out scripts repo into the Go module directory
      uses: actions/checkout@v2
      with:
@ -63,13 +64,12 @@ jobs:
      uses: actions/checkout@v2
      with:
        path: ./src/github.com/${{ github.repository }}
-    - name: Checkout Repo history to ensure we get correct version
+    - name: Fetch Tags
      run: |
-        cd ./src/github.com/${{ github.repository }} && git fetch --quiet --prune --unshallow
+        cd ./src/github.com/${{ github.repository }} && git fetch --quiet --prune --unshallow --tags
    - name: Get dependencies
      run: |
        cd src\github.com\${{ github.repository }}
-        set GO111MODULE=on
        pushd .
        cd sdk
        go mod tidy
--- a/.github/workflows/windows-pr.yml
+++ b/.github/workflows/windows-pr.yml
@ -1,6 +1,15 @@
 on:
  pull_request:

+env:
+  PULUMI_TEST_OWNER: "moolumi"
+  PULUMI_LOCAL_NUGET: "D:\\Pulumi\\nuget"
+  PULUMI_API: "https://api.pulumi-staging.io"
+  PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_LEGACY }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_LEGACY }}
+  GO111MODULE: "on"
+
 jobs:
  build:
    name: Build
@ -38,23 +47,16 @@ jobs:
    - name: Set Build Env Vars
      shell: bash
      run: |
-        echo "::set-env name=PULUMI_TEST_OWNER::moolumi"
-        echo "::set-env name=PULUMI_LOCAL_NUGET::D:\\Pulumi\\nuget"
-        echo "::set-env name=PULUMI_API::https://api.pulumi-staging.io"
-        echo "::set-env name=PULUMI_ACCESS_TOKEN::${{ secrets.PULUMI_ACCESS_TOKEN }}"
        echo "::add-path::D:\\Pulumi\\bin"
-    - name: Set AWS Env Vars
-      uses: allenevans/set-env@v1.0.0
-      with:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_LEGACY }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_LEGACY }}
+    - name: Install AWS CLI Tools
+      uses: chrislennon/action-aws-cli@v1.1
    - name: Check out code into the Go module directory
      uses: actions/checkout@v2
      with:
        path: ./src/github.com/${{ github.repository }}
-    - name: Checkout Repo history to ensure we get correct version
+    - name: Fetch Tags
      run: |
-        cd ./src/github.com/${{ github.repository }} && git fetch --quiet --prune --unshallow
+        cd ./src/github.com/${{ github.repository }} && git fetch --quiet --prune --unshallow --tags
    - name: Get dependencies
      run: |
        cd src\github.com\${{ github.repository }}
--- a/.github/workflows/windows-release.yml
+++ b/.github/workflows/windows-release.yml
@ -0,0 +1,91 @@
+on:
+  push:
+    tags:
+      - v*.*.*
+    paths-ignore:
+      - 'CHANGELOG.md'
+      - 'README.md'
+
+env:
+  PULUMI_TEST_OWNER: "moolumi"
+  PULUMI_LOCAL_NUGET: "D:\\Pulumi\\nuget"
+  PULUMI_API: "https://api.pulumi-staging.io"
+  PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_LEGACY }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_LEGACY }}
+  GO111MODULE: "on"
+
+jobs:
+  build:
+    name: Build
+    strategy:
+      matrix:
+        platform: [windows-latest]
+        go-version: [1.15.x]
+        node-version: [10.x]
+        python-version: [3.7]
+        dotnet: ['3.1.301']
+    runs-on: ${{ matrix.platform }}
+    env:
+      GOPATH: ${{ github.workspace }}
+    steps:
+    - name: Install DotNet ${{ matrix.dotnet }}
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: ${{ matrix.dotnet }}
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Set up Go ${{ matrix.go-version }}
+      uses: actions/setup-go@v1
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install Python Deps
+      run: |
+        pip3 install pyenv-win
+        pip3 install pipenv
+    - name: Set Build Env Vars
+      shell: bash
+      run: |
+        echo "::add-path::D:\\Pulumi\\bin"
+    - name: Install AWS CLI Tools
+      uses: chrislennon/action-aws-cli@v1.1
+    - name: Check out scripts repo into the Go module directory
+      uses: actions/checkout@v2
+      with:
+        repository: pulumi/scripts
+        path: ./src/github.com/pulumi/scripts
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+      with:
+        path: ./src/github.com/${{ github.repository }}
+    - name: Fetch Tags
+      run: |
+        cd ./src/github.com/${{ github.repository }} && git fetch --quiet --prune --unshallow --tags
+    - name: Get dependencies
+      run: |
+        cd src\github.com\${{ github.repository }}
+        pushd .
+        cd sdk
+        go mod tidy
+        go mod download
+        popd
+        pushd .
+        cd pkg
+        go mod tidy
+        go mod download
+        popd
+        pushd .
+        cd tests
+        go mod tidy
+        go mod download
+        popd
+    - name: Publish Binary
+      run: |
+        cd src\github.com\${{ github.repository }}
+        dotnet msbuild /t:ReleaseProcess /v:Detailed build.proj /p:PulumiRoot="D:\\Pulumi"
--- a/scripts/release.cmd
+++ b/scripts/release.cmd
@ -1,6 +0,0 @@
-echo %APPVEYOR_REPO_TAG_NAME%|findstr "^v[0-9]" >Nul 2>&1
-if %errorlevel% == 0 ( 
-dotnet msbuild /t:ReleaseProcess /v:Detailed build.proj
-) else (
-exit 0
-)