Skip to content

Commit

Permalink
Modify action files to run in bugfix/117 branch to see if the build p…
Browse files Browse the repository at this point in the history
…asses successfully.
  • Loading branch information
jonnybottles committed Nov 29, 2024
1 parent 8e37536 commit 97c798d
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 37 deletions.
47 changes: 26 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
# on:
# push:
# branches:
# - master
on:
pull_request:
branches:
- master
- Development
push:
branches:
- master
- Development
- "bugfix/117-fails-to-install-due-to-no-robustcloudcommand"
jobs:
build:
runs-on: windows-2019

# jobs:
# build:
# runs-on: windows-2019

# steps:
# - uses: actions/checkout@v1
# - name: Install Prerequisites
# run: .\build\vsts-prerequisites.ps1
# shell: powershell
# - name: Validate
# run: .\build\vsts-validate.ps1
# shell: powershell
# - name: Build
# run: .\build\vsts-build.ps1 -ApiKey $env:APIKEY
# shell: powershell
# env:
# APIKEY: ${{ secrets.ApiKey }}
steps:
- uses: actions/checkout@v1
- name: Install Prerequisites
run: .\build\vsts-prerequisites.ps1
shell: powershell
- name: Validate
run: .\build\vsts-validate.ps1
shell: powershell
- name: Build
run: .\build\vsts-build.ps1 -ApiKey $env:APIKEY
shell: powershell
env:
APIKEY: ${{ secrets.ApiKey }}
4 changes: 1 addition & 3 deletions .github/workflows/psscriptanalyzer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ on:
- "**.psd1"
push:
branches:
- main
- development
- master
- Development
- "feature/144-implement-dual-validation-psscriptanalyzer-with-standardized-settings"
paths:
- "**.ps1"
- "**.psm1"
Expand Down
34 changes: 21 additions & 13 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
# on: [pull_request]
on:
pull_request:
branches:
- master
- Development
push:
branches:
- master
- Development
- "bugfix/117-fails-to-install-due-to-no-robustcloudcommand"
jobs:
validate:
runs-on: windows-2019

# jobs:
# validate:
# runs-on: windows-2019

# steps:
# - uses: actions/checkout@v1
# - name: Install Prerequisites
# run: .\build\vsts-prerequisites.ps1
# shell: powershell
# - name: Validate
# run: .\build\vsts-validate.ps1
# shell: powershell
steps:
- uses: actions/checkout@v1
- name: Install Prerequisites
run: .\build\vsts-prerequisites.ps1
shell: powershell
- name: Validate
run: .\build\vsts-validate.ps1
shell: powershell

0 comments on commit 97c798d

Please sign in to comment.