diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..6afa25f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,29 @@ +name: ci + +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: install go + uses: actions/setup-go@v2 + with: + go-version: 1.15 + - name: build and test + run: make + - name: enable experimental docker features + run: | + echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json ~/.docker/config.json + sudo service docker restart + - name: build docker image + run: make docker-build + - name: publish docker image + run: make docker-push + - name: publish multi-arch docker image + run: make docker-pushx diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9d4d74d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -dist: bionic -language: minimal - -services: - - docker - -env: - global: - - DOCKER_CLI_EXPERIMENTAL=enabled - -before_install: - - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - - sudo apt-get update - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce - -script: - - make docker-build - -deploy: - - provider: script - script: make docker-push diff --git a/Makefile b/Makefile index d737343..6b1cfd9 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,10 @@ docker-test: $(eval DOCKER_PORT=$(shell $(DOCKER) port $(CONTAINER) | cut -d ":" -f 2)) curl -fsS -m 5 localhost:$(DOCKER_PORT) > /dev/null; $(DOCKER) stop $(CONTAINER) -docker-push: docker-test docker-multiarch-builder docker-login +docker-push: docker-test docker-login + $(DOCKER) push $(DOCKER_IMAGE) + +docker-pushx: docker-multiarch-builder docker-login $(DOCKER) buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(DOCKER_IMAGE) --push . xinstall: diff --git a/README.md b/README.md index 1284fcb..30cb0c3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # echoip -[![Build Status](https://travis-ci.org/mpolden/echoip.svg)](https://travis-ci.org/mpolden/echoip) +![Build Status](https://github.com/mpolden/echoip/workflows/ci/badge.svg) A simple service for looking up your IP address. This is the code that powers https://ifconfig.co.