From d5720e08aecdce4156faf8b7f4122db9394dd650 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 11:13:33 -0400 Subject: [PATCH 1/7] update policheck --- build/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/build/build.yml b/build/build.yml index 020385d7..0ef9f391 100644 --- a/build/build.yml +++ b/build/build.yml @@ -14,7 +14,6 @@ jobs: TeamName: C++ Cross Platform and Cloud templateContext: sdl: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: tsa: enabled: true GdnPublishTsaOnboard: true From e9117cc14d32b0009d855cd7f69d47ad79f10857 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 11:25:15 -0400 Subject: [PATCH 2/7] fix pipeline tsa and policheck --- azure-pipelines.yml | 6 ++++++ build/build.yml | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 741b5c62..b1d1702c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -55,6 +55,12 @@ extends: sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES spotBugs: enabled: false # Turn this off, this isn't java. + tsa: + enabled: true + GdnPublishTsaOnboard: true + GdnPublishTsaConfigFile: $(Build.SourcesDirectory)\build\tsa.gdntsa + policheck: + enabled: true customBuildTags: - ES365AIMigrationTooling stages: diff --git a/build/build.yml b/build/build.yml index 0ef9f391..266bb5c7 100644 --- a/build/build.yml +++ b/build/build.yml @@ -12,14 +12,6 @@ jobs: name: VSEngSS-MicroBuild2022-1ES variables: TeamName: C++ Cross Platform and Cloud - templateContext: - sdl: - tsa: - enabled: true - GdnPublishTsaOnboard: true - GdnPublishTsaConfigFile: $(Build.SourcesDirectory)\build\tsa.gdntsa - policheck: - enabled: true outputs: - output: pipelineArtifact displayName: 'Publish extension VSIXes as artifact' From 6973df5dd721aa50a24a22c136910472e86ea622 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 11:30:27 -0400 Subject: [PATCH 3/7] update --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b1d1702c..0984f1b0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,14 +53,14 @@ extends: name: VSEngSS-MicroBuild2022-1ES sdl: sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES - spotBugs: - enabled: false # Turn this off, this isn't java. tsa: enabled: true GdnPublishTsaOnboard: true GdnPublishTsaConfigFile: $(Build.SourcesDirectory)\build\tsa.gdntsa policheck: enabled: true + spotBugs: + enabled: false # Turn this off, this isn't java. customBuildTags: - ES365AIMigrationTooling stages: From a1e0d05fbcad497582a5976bc9f6a4cf65ef54f7 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 11:33:05 -0400 Subject: [PATCH 4/7] does it work without? --- azure-pipelines.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0984f1b0..741b5c62 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,12 +53,6 @@ extends: name: VSEngSS-MicroBuild2022-1ES sdl: sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES - tsa: - enabled: true - GdnPublishTsaOnboard: true - GdnPublishTsaConfigFile: $(Build.SourcesDirectory)\build\tsa.gdntsa - policheck: - enabled: true spotBugs: enabled: false # Turn this off, this isn't java. customBuildTags: From 2ba8a1e0407a82c16433a975be138d6501d88088 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 11:36:18 -0400 Subject: [PATCH 5/7] update --- azure-pipelines.yml | 6 ++++++ build/build.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 741b5c62..0984f1b0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,6 +53,12 @@ extends: name: VSEngSS-MicroBuild2022-1ES sdl: sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES + tsa: + enabled: true + GdnPublishTsaOnboard: true + GdnPublishTsaConfigFile: $(Build.SourcesDirectory)\build\tsa.gdntsa + policheck: + enabled: true spotBugs: enabled: false # Turn this off, this isn't java. customBuildTags: diff --git a/build/build.yml b/build/build.yml index 266bb5c7..396e6d3f 100644 --- a/build/build.yml +++ b/build/build.yml @@ -12,6 +12,7 @@ jobs: name: VSEngSS-MicroBuild2022-1ES variables: TeamName: C++ Cross Platform and Cloud + templateContext: outputs: - output: pipelineArtifact displayName: 'Publish extension VSIXes as artifact' From 830b3942d72df00a74a0bc50ac1563de30661db8 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 12:11:53 -0400 Subject: [PATCH 6/7] try macos-12 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 924a70b4..ae8e86db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-12, windows-latest ] steps: - name: Checkout From c497d2f5e1ec02500665e6ec88f8975f9b7a11a3 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Mon, 6 May 2024 12:18:07 -0400 Subject: [PATCH 7/7] try modify python --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae8e86db..6ee2ea3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-12, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] steps: - name: Checkout @@ -34,6 +34,13 @@ jobs: with: node-version: 16.x + # On new macos-latest machines, Python 3.9+ is used, and it's causing issues with binding.gyp + - name: Use Python 3.8 + if: ${{ matrix.os == 'macos-latest' }} + uses: actions/setup-python@v5 + with: + python-version: 3.8 + - name: Windows setup if: ${{ matrix.os == 'windows-latest' }} run: |