Skip to content

Remove unneeded PR trigger and enable tests on Linux and macOS platforms #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .ci/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions .ci/ci_auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
34 changes: 13 additions & 21 deletions .ci/ci_release.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -326,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
Expand Down