pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes order of operations for contains statement

Browse Source
This commit is contained in:
Andrew Welker
2020-05-13 11:42:18 -06:00
parent a4339bf5a4
commit b0a21a1c2f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/docker.yml vendored
View File

@@ -78,14 +78,14 @@ jobs:
path: ${{env.GITHUB_HOME}}\output\version.txt path: ${{env.GITHUB_HOME}}\output\version.txt
# Create the release on the source repo # Create the release on the source repo
- name: Create tag for non-rc builds - name: Create tag for non-rc builds
if: contains('-alpha-', env.VERSION) || contains('-beta-', env.VERSION) if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
run: | run: |
git tag $($Env:VERSION) git tag $($Env:VERSION)
git push --tags origin git push --tags origin
- name: Create Release - name: Create Release
id: create_release id: create_release
# using contributor's version to allow for pointing at the right commit # using contributor's version to allow for pointing at the right commit
if: contains('-rc-', env.VERSION) || contains('-hotfix-', env.VERSION) if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
uses: fleskesvor/create-release@feature/support-target-commitish uses: fleskesvor/create-release@feature/support-target-commitish
with: with:
tag_name: ${{ env.VERSION }} tag_name: ${{ env.VERSION }}
@@ -95,7 +95,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Upload the build package to the release # Upload the build package to the release
- name: Upload Release Package - name: Upload Release Package
if: contains('-rc-', env.VERSION) || contains('-hotfix-', env.VERSION) if: contains(env.VERSION,'-rc-') || contains(env.VERSION,'-hotfix-')
id: upload_release id: upload_release
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
with: with:
@@ -110,6 +110,8 @@ jobs:
needs: Build_Project needs: Build_Project
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- name: check Github ref
run: ${{toJson(github.ref)}}
# Checkout the repo # Checkout the repo
- name: Checkout Builds Repo - name: Checkout Builds Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -188,6 +190,8 @@ jobs:
if: contains(github.ref, 'master') || contains(github.ref, 'release') if: contains(github.ref, 'master') || contains(github.ref, 'release')
steps: steps:
# Checkout the repo # Checkout the repo
- name: check Github ref
run: ${{toJson(github.ref)}}
- name: Checkout Builds Repo - name: Checkout Builds Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with: