diff options
| author | Adrian Thurston <thurston@colm.net> | 2020-10-11 09:40:36 -0700 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2020-10-12 07:54:56 -0700 |
| commit | bd74865a0d0178d721e4ca5919eff2f823886fd0 (patch) | |
| tree | de78405bbaee0b7eba450abd536f63e8caf6ed14 | |
| parent | 0556278f669af92e65e56d99c0f8762f3d2f9d83 (diff) | |
| download | ragel-bd74865a0d0178d721e4ca5919eff2f823886fd0.tar.gz | |
fixed ragel CI
* Checkout, build and install colm first, use when configuring ragel.
* Include test dir in SUBDIRS of main Makefile.
* Replaced colm-suite-* paths with ragel-*.
| -rw-r--r-- | .github/workflows/build-test.yml | 21 | ||||
| -rw-r--r-- | Makefile.am | 2 |
2 files changed, 15 insertions, 8 deletions
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2e3df9c3..88a2b3da 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -1,20 +1,27 @@ -name: Build/Test/Dist CI +name: build-test-dist-test on: [push] jobs: - build: + main: runs-on: self-hosted steps: - uses: actions/checkout@v1 + - name: download colm + run: wget https://github.com/adrian-thurston/colm/tarball/master -O - | tar zxv + + - name: install colm + run: > + COLM=`pwd`/inst/colm && cd adrian-thurston-colm-* && ./autogen.sh && + ./configure --prefix=$COLM --disable-manual && make install - name: autogen run: ./autogen.sh - name: configure - run: ./configure --disable-manual + run: COLM=`pwd`/inst/colm && ./configure --with-colm=$COLM --disable-manual - name: make run: make @@ -26,13 +33,13 @@ jobs: run: make dist - name: unpack - run: mkdir unpack && tar -C unpack -zxvf colm-suite-*.tar.gz + run: mkdir unpack && tar -C unpack -zxvf ragel-*.tar.gz - name: configure the dist - run: cd unpack/colm-suite-* && ./configure --disable-manual + run: COLM=`pwd`/inst/colm && cd unpack/ragel-* && ./configure --with-colm=$COLM --disable-manual - name: make the dist - run: cd unpack/colm-suite-* && make + run: cd unpack/ragel-* && make - name: test the dist - run: cd unpack/colm-suite-*/test && ./runtests + run: cd unpack/ragel-*/test && ./runtests diff --git a/Makefile.am b/Makefile.am index 3240dc3d..fbcd78b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -SUBDIRS = src doc # test +SUBDIRS = src doc test DIST_SUBDIRS = $(SUBDIRS) dist_doc_DATA = ragel.vim |