From 44eada6eb92f96b48070907864b122d265ebed7c Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Fri, 26 Mar 2021 13:28:12 +0100 Subject: [PATCH 1/6] update docker actions to v2 --- .github/workflows/backend.yml | 11 ++++++----- .github/workflows/frontend.yml | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index c6f6b41..b1a44e5 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -22,14 +22,15 @@ jobs: - name: Build release and call executable working-directory: ./backend run: cargo run --release -- --help - - name: Build and Push template image - uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action + - name: Login to Dockerhub + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - path: ./backend/ - dockerfile: ./backend/Dockerfile + - name: Build and Push template image + uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action + context: . repository: parity/substrate-telemetry-backend push: ${{ startsWith(github.ref, 'refs/tags/') }} tags: latest - add_git_labels: true + # add_git_labels: true diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index f5f7040..fb74543 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -36,15 +36,16 @@ jobs: - name: Build working-directory: ./frontend run: yarn build - - name: Build and Push template image - uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action - if: matrix.node-version == '12.x' + - name: Login to Dockerhub + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - path: ./frontend/ - dockerfile: ./frontend/Dockerfile + - name: Build and Push template image + uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action + if: matrix.node-version == '12.x' + context: ./frontend/ repository: parity/substrate-telemetry-frontend push: ${{ startsWith(github.ref, 'refs/tags/') }} tags: latest - add_git_labels: true + # add_git_labels: true From 9a268c5d4928616b3b5c6e04943da7842a438d81 Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Fri, 26 Mar 2021 13:29:47 +0100 Subject: [PATCH 2/6] fix strings --- .github/workflows/backend.yml | 2 +- .github/workflows/frontend.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index b1a44e5..7bce742 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -29,7 +29,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and Push template image uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action - context: . + context: './backend' repository: parity/substrate-telemetry-backend push: ${{ startsWith(github.ref, 'refs/tags/') }} tags: latest diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index fb74543..c06b2e8 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -44,7 +44,7 @@ jobs: - name: Build and Push template image uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action if: matrix.node-version == '12.x' - context: ./frontend/ + context: './frontend' repository: parity/substrate-telemetry-frontend push: ${{ startsWith(github.ref, 'refs/tags/') }} tags: latest From 673a649a9c0f0aeeeac6fb1417e1879d02169f07 Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Fri, 26 Mar 2021 13:30:48 +0100 Subject: [PATCH 3/6] fix frontend.yml --- .github/workflows/frontend.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index c06b2e8..d6258c3 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -44,6 +44,7 @@ jobs: - name: Build and Push template image uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action if: matrix.node-version == '12.x' + with: context: './frontend' repository: parity/substrate-telemetry-frontend push: ${{ startsWith(github.ref, 'refs/tags/') }} From de83475e1029ed0ae5782eee93673a6b68745baf Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Fri, 26 Mar 2021 13:31:25 +0100 Subject: [PATCH 4/6] fix backend.yml --- .github/workflows/backend.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 7bce742..ad30c05 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -29,6 +29,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and Push template image uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action + with: context: './backend' repository: parity/substrate-telemetry-backend push: ${{ startsWith(github.ref, 'refs/tags/') }} From 7fd740e25d10f582f592e935d7c71888fccc8b57 Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Fri, 26 Mar 2021 13:35:16 +0100 Subject: [PATCH 5/6] fix tags maybe --- .github/workflows/backend.yml | 3 +-- .github/workflows/frontend.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index ad30c05..cd653c1 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -31,7 +31,6 @@ jobs: uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action with: context: './backend' - repository: parity/substrate-telemetry-backend push: ${{ startsWith(github.ref, 'refs/tags/') }} - tags: latest + tags: parity/substrate-telemetry-backend:latest # add_git_labels: true diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index d6258c3..4c739d2 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -46,7 +46,6 @@ jobs: if: matrix.node-version == '12.x' with: context: './frontend' - repository: parity/substrate-telemetry-frontend push: ${{ startsWith(github.ref, 'refs/tags/') }} - tags: latest + tags: parity/substrate-telemetry-frontend:latest # add_git_labels: true From ac8a4c4d8b6bf51ac36e326c5cb514e0a44f913c Mon Sep 17 00:00:00 2001 From: Martin Pugh Date: Fri, 26 Mar 2021 13:38:54 +0100 Subject: [PATCH 6/6] lets run CI when CI gets updated.... --- .github/workflows/backend.yml | 1 + .github/workflows/frontend.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index cd653c1..796dc6f 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -3,6 +3,7 @@ name: Backend CI on: push: paths: + - '.github/workflows/**' - 'backend/**' - '!frontend/**' diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 4c739d2..b6b55ef 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -6,6 +6,7 @@ name: Frontend CI on: push: paths: + - '.github/workflows/**' - 'frontend/**' - '!backend/**'