From 01e2a51132850e03c0965a1e18e878897179e68f Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Tue, 8 Jun 2021 21:28:19 +0200 Subject: [PATCH] Implement versioning for esphome/esphome-lint docker images (#1877) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/docker-lint-build.yml | 5 +++++ .github/workflows/release-dev.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56e94cb32c..5075609526 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:latest + container: esphome/esphome-lint:1.0 steps: - uses: actions/checkout@v2 # Set up the pio project so that the cpp checks know how files are compiled @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:latest + container: esphome/esphome-lint:1.0 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files strategy: fail-fast: false diff --git a/.github/workflows/docker-lint-build.yml b/.github/workflows/docker-lint-build.yml index f148d98d65..4e75a4c162 100644 --- a/.github/workflows/docker-lint-build.yml +++ b/.github/workflows/docker-lint-build.yml @@ -17,6 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Set TAG + run: | + echo "TAG=1.0" >> $GITHUB_ENV - name: Pull for cache run: | docker pull "esphome/esphome-lint:latest" || true @@ -26,6 +29,7 @@ jobs: --cache-from "esphome/esphome-lint:latest" \ --file "docker/Dockerfile.lint" \ --tag "esphome/esphome-lint:latest" \ + --tag "esphome/esphome-lint:${TAG}" \ . - name: Log in to docker hub env: @@ -33,4 +37,5 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}" - run: | + docker push "esphome/esphome-lint:${TAG}" docker push "esphome/esphome-lint:latest" diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index 9361ab4b73..917e273aea 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:latest + container: esphome/esphome-lint:1.0 steps: - uses: actions/checkout@v2 # Set up the pio project so that the cpp checks know how files are compiled @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:latest + container: esphome/esphome-lint:1.0 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files strategy: fail-fast: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 39cc7c37ce..806e23d7e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:latest + container: esphome/esphome-lint:1.0 steps: - uses: actions/checkout@v2 # Set up the pio project so that the cpp checks know how files are compiled @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest # cpp lint job runs with esphome-lint docker image so that clang-format-* # doesn't have to be installed - container: esphome/esphome-lint:latest + container: esphome/esphome-lint:1.0 # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files strategy: fail-fast: false