aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml33
-rw-r--r--.github/workflows/master_push.yml23
-rw-r--r--.github/workflows/pull_request.yml15
-rw-r--r--Makefile1
-rw-r--r--README.md2
5 files changed, 39 insertions, 35 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index f40a34c..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,33 +0,0 @@
1version: 2
2jobs:
3 build:
4 docker:
5 - image: circleci/node
6 steps:
7 - checkout
8 - setup_remote_docker:
9 version: 19.03.13
10 - run: make build
11
12 build_and_publish:
13 docker:
14 - image: circleci/node
15 steps:
16 - checkout
17 - setup_remote_docker:
18 version: 19.03.13
19 - run: make build
20 - run: make publish
21
22workflows:
23 version: 2
24 build:
25 jobs:
26 - build:
27 filters:
28 branches:
29 ignore: master
30 - build_and_publish:
31 filters:
32 branches:
33 only: master
diff --git a/.github/workflows/master_push.yml b/.github/workflows/master_push.yml
new file mode 100644
index 0000000..7c56fec
--- /dev/null
+++ b/.github/workflows/master_push.yml
@@ -0,0 +1,23 @@
1name: ci
2on:
3 push:
4 branches: master
5jobs:
6 build-and-publish:
7 runs-on: ubuntu-latest
8 steps:
9 -
10 name: Checkout
11 uses: actions/checkout@v2
12 -
13 name: Set up Docker
14 uses: docker/setup-buildx-action@v1
15 -
16 name: Login to DockerHub
17 uses: docker/login-action@v1
18 with:
19 username: ${{ secrets.DOCKERHUB_USERNAME }}
20 password: ${{ secrets.DOCKERHUB_TOKEN }}
21 -
22 name: Build and publish
23 run: make build publish
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
new file mode 100644
index 0000000..5a2ee16
--- /dev/null
+++ b/.github/workflows/pull_request.yml
@@ -0,0 +1,15 @@
1name: ci
2on: pull_request
3jobs:
4 build:
5 runs-on: ubuntu-latest
6 steps:
7 -
8 name: Checkout
9 uses: actions/checkout@v2
10 -
11 name: Set up Docker
12 uses: docker/setup-buildx-action@v1
13 -
14 name: Build
15 run: make build
diff --git a/Makefile b/Makefile
index 421bb16..3ac82a2 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,6 @@ run:
20 20
21.PHONY: publish 21.PHONY: publish
22publish: 22publish:
23 @docker login -u $(DOCKER_USER) -p $(DOCKER_PASS)
24 docker push $(TAG_LATEST) 23 docker push $(TAG_LATEST)
25 @docker tag $(TAG_LATEST) $(TAG_COMMIT) 24 @docker tag $(TAG_LATEST) $(TAG_COMMIT)
26 docker push $(TAG_COMMIT) 25 docker push $(TAG_COMMIT)
diff --git a/README.md b/README.md
index 1c992df..0df9331 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
1[![CircleCI](https://circleci.com/gh/bndw/wifi-card.svg?style=svg)](https://circleci.com/gh/bndw/wifi-card) 1![ci](https://github.com/bndw/wifi-card/workflows/ci/badge.svg)
2 2
3# 📶 WiFi Card 3# 📶 WiFi Card
4 4