Merge pull request #3630 from myk002/myk_bash

avoid platform-specific steps by using same shell
develop
Myk 2023-08-04 13:42:30 -07:00 committed by GitHub
commit 261367cf03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions

@ -68,22 +68,16 @@ jobs:
# gcc: 12 # gcc: 12
# plugins: "all" # plugins: "all"
steps: steps:
- name: Set env (windows) - name: Set env
if: matrix.os == 'windows' shell: bash
run: echo "DF_FOLDER=DF" >> $env:GITHUB_ENV
- name: Set env (posix)
if: matrix.os != 'windows'
run: echo "DF_FOLDER=DF" >> $GITHUB_ENV run: echo "DF_FOLDER=DF" >> $GITHUB_ENV
- name: Clone DFHack - name: Clone DFHack
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
repository: 'DFHack/dfhack' repository: 'DFHack/dfhack'
ref: ${{ inputs.dfhack_ref }} ref: ${{ inputs.dfhack_ref }}
- name: Detect DF version (windows) - name: Detect DF version
if: matrix.os == 'windows' shell: bash
run: echo DF_VERSION="$(sh ci/get-df-version.sh)" >> $env:GITHUB_ENV
- name: Detect DF version (posix)
if: matrix.os != 'windows'
run: echo DF_VERSION="$(sh ci/get-df-version.sh)" >> $GITHUB_ENV run: echo DF_VERSION="$(sh ci/get-df-version.sh)" >> $GITHUB_ENV
- name: Fetch DF cache - name: Fetch DF cache
id: restore-df id: restore-df