diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b64dd62..3af07a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,8 @@ name: Build on: - push + pull_request: + branches: [ main, release** ] jobs: build: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 38d3671..58bb470 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -12,7 +12,8 @@ name: "CodeQL" on: - push + pull_request: + branches: [ main, release** ] jobs: analyze: diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 3b0978e..bf2fdee 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -72,7 +72,11 @@ jobs: environment: Development env: deploy-folder: c:/websites/robertlynja - + + defaults: + run: + shell: powershell + steps: - name: Download a Build Artifact (.Net) uses: actions/download-artifact@v3 @@ -101,4 +105,4 @@ jobs: run: Copy-Item ./website/* ${{ env.deploy-folder }} -Recurse -Force - name: Remove app offline run: Remove-Item ${{ env.deploy-folder }}/app_offline.htm - + \ No newline at end of file diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 0d197e0..59171fe 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -2,6 +2,7 @@ name: Deploy-To-Prod concurrency: deploy-production on: + push: branches: - "release**" @@ -30,6 +31,7 @@ jobs: # npm cache files are stored in `~/.npm` on Linux/macOS path: ~/.npm key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + - name: BuildUI run: | npm install --prefix web @@ -71,6 +73,10 @@ jobs: env: deploy-folder: c:/websites/robertlynja + defaults: + run: + shell: powershell + steps: - name: Download a Build Artifact (.Net) uses: actions/download-artifact@v3