;ci: github: tweaks

This commit is contained in:
Simon Michael 2020-03-06 11:06:15 -08:00
parent 73634d09d5
commit 1fb6fbe807
3 changed files with 32 additions and 16 deletions

View File

@ -30,7 +30,7 @@ on:
- 'hledger' - 'hledger'
- 'hledger-ui' - 'hledger-ui'
- 'hledger-web' - 'hledger-web'
- '.github/workflows/*' - '.github/workflows/linux*'
- '!**.md' - '!**.md'
- '!**.1' - '!**.1'
- '!**.5' - '!**.5'
@ -44,7 +44,7 @@ on:
- 'hledger' - 'hledger'
- 'hledger-ui' - 'hledger-ui'
- 'hledger-web' - 'hledger-web'
- '.github/workflows/*' - '.github/workflows/linux*'
- '!**.md' - '!**.md'
- '!**.1' - '!**.1'
- '!**.5' - '!**.5'
@ -150,6 +150,7 @@ jobs:
- name: Install shelltestrunner - name: Install shelltestrunner
run: | run: |
export PATH=~/.local/bin:$PATH
if [[ ! -x ~/.local/bin/shelltest ]]; then stack $ARGS install shelltestrunner-1.9; fi if [[ ! -x ~/.local/bin/shelltest ]]; then stack $ARGS install shelltestrunner-1.9; fi
shelltest --version shelltest --version
env: env:
@ -171,6 +172,13 @@ jobs:
- name: Functional tests (excluding addons) - name: Functional tests (excluding addons)
run: | run: |
export PATH=~/.local/bin:$PATH
COLUMNS=80 stack $ARGS exec -- shelltest --execdir -j16 tests -x /bin -x /addons COLUMNS=80 stack $ARGS exec -- shelltest --execdir -j16 tests -x /bin -x /addons
env: env:
ARGS: ${{ matrix.plan.resolver }} ARGS: ${{ matrix.plan.resolver }}
# - name: Configure
# if: startsWith(matrix.name, 'linux')
# run: |
# export PATH=/usr/local/bin:$PATH
# cmake -B build -S . -DCMAKE_BUILD_TYPE=Debug ...

View File

@ -15,7 +15,7 @@ on:
- 'hledger' - 'hledger'
- 'hledger-ui' - 'hledger-ui'
- 'hledger-web' - 'hledger-web'
- '.github/workflows/*' - '.github/workflows/mac*'
- '!**.md' - '!**.md'
- '!**.1' - '!**.1'
- '!**.5' - '!**.5'
@ -29,7 +29,7 @@ on:
# - 'hledger' # - 'hledger'
# - 'hledger-ui' # - 'hledger-ui'
# - 'hledger-web' # - 'hledger-web'
# - '.github/workflows/*' # - '.github/workflows/mac*'
# - '!**.md' # - '!**.md'
# - '!**.1' # - '!**.1'
# - '!**.5' # - '!**.5'

View File

@ -15,7 +15,7 @@ on:
- 'hledger' - 'hledger'
- 'hledger-ui' - 'hledger-ui'
- 'hledger-web' - 'hledger-web'
- '.github/workflows/*' - '.github/workflows/windows*'
- '!**.md' - '!**.md'
- '!**.1' - '!**.1'
- '!**.5' - '!**.5'
@ -29,7 +29,7 @@ on:
# - 'hledger' # - 'hledger'
# - 'hledger-ui' # - 'hledger-ui'
# - 'hledger-web' # - 'hledger-web'
# - '.github/workflows/*' # - '.github/workflows/windows*'
# - '!**.md' # - '!**.md'
# - '!**.1' # - '!**.1'
# - '!**.5' # - '!**.5'
@ -49,11 +49,11 @@ jobs:
path: ~/.stack path: ~/.stack
key: ${{ runner.os }}-stack key: ${{ runner.os }}-stack
- name: Cache %APPDATA%/.stack # - name: Cache %APPDATA%/.stack
uses: actions/cache@v1 # uses: actions/cache@v1
with: # with:
path: %APPDATA%/.stack # path: %APPDATA%/.stack
key: ${{ runner.os }}-stack # key: ${{ runner.os }}-stack
- name: Cache $APPDATA/.stack - name: Cache $APPDATA/.stack
uses: actions/cache@v1 uses: actions/cache@v1
@ -61,11 +61,11 @@ jobs:
path: $APPDATA/.stack path: $APPDATA/.stack
key: ${{ runner.os }}-stack key: ${{ runner.os }}-stack
- name: Cache %APPDATA%/local/bin # - name: Cache %APPDATA%/local/bin
uses: actions/cache@v1 # uses: actions/cache@v1
with: # with:
path: %APPDATA%/local/bin # path: %APPDATA%/local/bin
key: ${{ runner.os }}-local-bin # key: ${{ runner.os }}-local-bin
- name: Cache $APPDATA/local/bin - name: Cache $APPDATA/local/bin
uses: actions/cache@v1 uses: actions/cache@v1
@ -145,3 +145,11 @@ jobs:
# with: # with:
# name: hledger.zip # name: hledger.zip
# path: hledger.zip # path: hledger.zip
# - name: Configure
# if: startsWith(matrix.name, 'windows')
# run: |
# set PATH=C:\ProgramData\scoop\shims;%PATH%
# call "${{ matrix.vcvarsall }}" x64 # Sets a whole bunch of environment variables used by the next call to cmake.
# cmake -B build -S . -DCMAKE_BUILD_TYPE=Debug ... # Same as above (duplicated)