From 01ef7bdbfe336133e4dc85536f34ffd773684f9d Mon Sep 17 00:00:00 2001 From: Paul Higinbotham Date: Tue, 27 Jul 2021 14:44:36 -0700 Subject: [PATCH 1/2] Remove unneeded PR trigger --- .ci/ci_release.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.ci/ci_release.yml b/.ci/ci_release.yml index 31fc6f949..bd33773e5 100644 --- a/.ci/ci_release.yml +++ b/.ci/ci_release.yml @@ -1,14 +1,6 @@ name: $(BuildDefinitionName)-$(date:yyMM).$(date:dd)$(rev:rrr) -trigger: - # Batch merge builds together while a merge build is running - batch: false - branches: - include: - - master -pr: - branches: - include: - - master +trigger: none +pr: none variables: - group: ESRP From 2c6deb66ad5401cf423851ae016b3ee64d5a8fbd Mon Sep 17 00:00:00 2001 From: Paul Higinbotham Date: Tue, 27 Jul 2021 14:54:05 -0700 Subject: [PATCH 2/2] Enable tests on Linux and macOS --- .ci/ci.yml | 20 ++++++++++---------- .ci/ci_auto.yml | 22 +++++++++++----------- .ci/ci_release.yml | 22 +++++++++++----------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.ci/ci.yml b/.ci/ci.yml index 7cecb9d49..b4126ca56 100644 --- a/.ci/ci.yml +++ b/.ci/ci.yml @@ -123,14 +123,14 @@ stages: imageName: windows-latest powershellExecutable: powershell -# - template: test.yml -# parameters: -# jobName: TestPkgUbuntu16 -# displayName: PowerShell Core on Ubuntu -# imageName: ubuntu-latest + - template: test.yml + parameters: + jobName: TestPkgUbuntu16 + displayName: PowerShell Core on Ubuntu + imageName: ubuntu-latest -# - template: test.yml -# parameters: -# jobName: TestPkgWinMacOS -# displayName: PowerShell Core on macOS -# imageName: macOS-latest + - template: test.yml + parameters: + jobName: TestPkgWinMacOS + displayName: PowerShell Core on macOS + imageName: macOS-latest diff --git a/.ci/ci_auto.yml b/.ci/ci_auto.yml index 9080e4dc1..2facb5286 100644 --- a/.ci/ci_auto.yml +++ b/.ci/ci_auto.yml @@ -320,14 +320,14 @@ stages: imageName: windows-latest powershellExecutable: powershell -# - template: test.yml -# parameters: -# jobName: TestPkgUbuntu16 -# displayName: PowerShell Core on Ubuntu 16.04 -# imageName: ubuntu-16.04 - -# - template: test.yml -# parameters: -# jobName: TestPkgWinMacOS -# displayName: PowerShell Core on macOS -# imageName: macOS-10.14 + - template: test.yml + parameters: + jobName: TestPkgUbuntu16 + displayName: PowerShell Core on Ubuntu 16.04 + imageName: ubuntu-16.04 + + - template: test.yml + parameters: + jobName: TestPkgWinMacOS + displayName: PowerShell Core on macOS + imageName: macOS-10.14 diff --git a/.ci/ci_release.yml b/.ci/ci_release.yml index bd33773e5..457544d32 100644 --- a/.ci/ci_release.yml +++ b/.ci/ci_release.yml @@ -318,17 +318,17 @@ stages: imageName: windows-latest powershellExecutable: powershell -# - template: test.yml -# parameters: -# jobName: TestPkgUbuntu16 -# displayName: PowerShell Core on Ubuntu 16.04 -# imageName: ubuntu-16.04 - -# - template: test.yml -# parameters: -# jobName: TestPkgWinMacOS -# displayName: PowerShell Core on macOS -# imageName: macOS-10.14 + - template: test.yml + parameters: + jobName: TestPkgUbuntu16 + displayName: PowerShell Core on Ubuntu 16.04 + imageName: ubuntu-16.04 + + - template: test.yml + parameters: + jobName: TestPkgWinMacOS + displayName: PowerShell Core on macOS + imageName: macOS-10.14 - stage: Release displayName: Publish Package to PSGallery