Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/GitHubTest.Web/jQuery.Valid…
Browse files Browse the repository at this point in the history
…ation-1.19.4
  • Loading branch information
glensouza committed Sep 6, 2023
2 parents 26ad8b6 + f54c444 commit 8b8de1b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/composite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
ACR-NAME: myacr
ACR-NAME: glencontainerregistry

jobs:
main:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/conditions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: setup
run: echo setup
run: echo setup ${{ github.event.inputs.runstep }}
- name: optional
run: echo optional step
if: github.event.inputs.runstep == true
if: ${{ github.event.inputs.runstep == 'true' }}
5 changes: 2 additions & 3 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,13 @@ jobs:
- name: Build Solution
run: |
msbuild.exe /p:platform="Any CPU" /p:configuration="Release"
- name: Run Tests
run: vstest.console.exe GitHubTest.Tests\bin\Release\GitHubTest.Tests.dll
- name: Publish to folder
if: always()
run: msbuild GitHubTest.Web\GitHubTest.Web.csproj /nologo /verbosity:m /t:Build /t:pipelinePreDeployCopyAllFilesToOneFolder /p:_PackageTempDir="\published\"

- name: Upload artifact for deployment job
if: always()
uses: actions/upload-artifact@v2
with:
name: ASP-app
Expand Down

0 comments on commit 8b8de1b

Please sign in to comment.