diff --git a/.github/actions/httpbin/action.yml b/.github/actions/httpbin/action.yml index 9e97560..d516ffe 100644 --- a/.github/actions/httpbin/action.yml +++ b/.github/actions/httpbin/action.yml @@ -8,4 +8,4 @@ runs: - name: Run HTTPBin uses: docker://kennethreitz/httpbin with: - args: -p 8000:80 \ No newline at end of file + args: -p 80:80 \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6361a17..d1eab45 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,29 +7,35 @@ on: jobs: - # tests: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v3 - # - uses: ./.github/actions/prepare - # - uses: ./.github/actions/build - # - name: make check - # run: make check + tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/prepare + - uses: ./.github/actions/build + - name: make check + run: make check integration: runs-on: ubuntu-latest env: - HTTPBIN_URL: "http://127.0.0.1:8000" + HTTPBIN_URL: "http://127.0.0.1:80" + services: + httpbin: + image: kennethreitz/httpbin + ports: + - 80:80 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/prepare - uses: ./.github/actions/build - - uses: ./.github/actions/httpbin + #- uses: ./.github/actions/httpbin - name: make integration run: | - php -r "echo 'HTTPBIN_URL=' . getenv('HTTPBIN_URL');" - make -C integration-tests check - cat integration-tests/test-suite.log + curl http://127.0.0.1:80/get +# php -r "echo 'HTTPBIN_URL=' . getenv('HTTPBIN_URL');" +# make -C integration-tests check +# cat integration-tests/test-suite.log # try: # runs-on: ubuntu-latest