From 7fa997087f3968c1eed56fa719551606ad7962c0 Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Fri, 10 May 2024 21:15:04 +0200 Subject: [PATCH] chore: build docker test image --- .github/workflows/build-dockerfile.yml | 34 +++++++++++++++++++++++ .github/workflows/cd.yml | 3 +-- .github/workflows/ui-test.yml | 37 ++++++++++++++++++++++++++ .releaserc | 6 +---- docker/cloneBuildAndTest.sh | 4 --- 5 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/build-dockerfile.yml create mode 100644 .github/workflows/ui-test.yml diff --git a/.github/workflows/build-dockerfile.yml b/.github/workflows/build-dockerfile.yml new file mode 100644 index 0000000..17e4c3f --- /dev/null +++ b/.github/workflows/build-dockerfile.yml @@ -0,0 +1,34 @@ +name: Build + +on: + push: + branches: + - master + - release + - beta + - tnordquist/test-ci + paths: + - ./docker + - .github + +jobs: + create-image: + runs-on: ubuntu-latest + steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + push: true + tags: thomasnordquist/mqtt-explorer-ui-tests:latest diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d9d7af2..8c6f46c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -3,8 +3,7 @@ name: Build on: push: branches: - - master - - alpha + - release - beta concurrency: diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml new file mode 100644 index 0000000..36c2e4b --- /dev/null +++ b/.github/workflows/ui-test.yml @@ -0,0 +1,37 @@ +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + name: A job to say hello + steps: + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + push: true + tags: thomasnordquist/mqtt-explorer-ui-tests:latest + test: + runs-on: ubuntu-latest + container: + image: thomasnordquist/mqtt-explorer-ui-tests:latest + volumes: + - ./:/app + steps: + - name: Install Packages + run: yarn install --frozen-lockfile + - name: Build + run: yarn build + - name: Install Packages + run: yarn ui-test diff --git a/.releaserc b/.releaserc index c809378..a7ba16e 100644 --- a/.releaserc +++ b/.releaserc @@ -1,13 +1,9 @@ { "branches": [ - "master", + "release", { "name": "beta", "prerelease": true - }, - { - "name": "alpha", - "prerelease": true } ], "plugins": [ diff --git a/docker/cloneBuildAndTest.sh b/docker/cloneBuildAndTest.sh index ba21b25..2c4f589 100755 --- a/docker/cloneBuildAndTest.sh +++ b/docker/cloneBuildAndTest.sh @@ -1,10 +1,6 @@ #!/bin/bash set -e -git clone https://github.com/thomasnordquist/MQTT-Explorer.git /app -cd /app -git checkout travis-ui-tests - yarn install --frozen-lockfile yarn build