diff options
| author | umarcor <38422348+umarcor@users.noreply.github.com> | 2020-05-20 06:45:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 06:45:00 +0200 |
| commit | 0e39a575da602ee833996c6ac30adc7c9069622e (patch) | |
| tree | db57c920a4a9b6e52958d1ebb981006ceede5684 /.github/workflows | |
| parent | 42cbe9183ac8f2138ef827180baae4beaee2d3f1 (diff) | |
| download | ghdl-0e39a575da602ee833996c6ac30adc7c9069622e.tar.gz ghdl-0e39a575da602ee833996c6ac30adc7c9069622e.tar.bz2 ghdl-0e39a575da602ee833996c6ac30adc7c9069622e.zip | |
rework 'version.tmp' (#1320)
* msys2: work around makepkg hanging at the end of build()
* ci: update actions/checkout to v2
* make: allow setting default description through GHDL_DESC
* ci: ensure clean git describe on MSYS2
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/doc.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/push.yml | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index ca57d00e2..9431d4f84 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -4,6 +4,6 @@ jobs: linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: build doc run: ./doc/make.sh diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 77688fa3f..d9d228bea 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,7 +10,7 @@ jobs: gpl: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - run: | TASK=buster+mcode ./dist/ci-run.sh -c --gpl --no-synth @@ -22,14 +22,14 @@ jobs: task: [ mcode, llvm-7, gcc-8.3.0 ] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - run: | TASK=buster+${{ matrix.task }} ./dist/ci-run.sh -c osx: runs-on: macOS-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - run: | brew update brew install p7zip @@ -61,7 +61,9 @@ jobs: with: msystem: MSYS update: true - - uses: actions/checkout@v1 + install: base-devel git + - run: git config --global core.autocrlf input + - uses: actions/checkout@v2 - name: Build and (hopefully) install package shell: msys2 {0} run: | |