Skip to content

Commit

Permalink
Remove i386 arch
Browse files Browse the repository at this point in the history
  • Loading branch information
OttoWinter authored and rspaargaren committed Jul 30, 2020
1 parent d095eb6 commit ee549be
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 17 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ jobs:
needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
strategy:
matrix:
arch: [amd64, i386, armv7, aarch64]
arch: [amd64, armv7, aarch64]
# Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly
build_type: ["docker"]
steps:
Expand All @@ -187,7 +187,7 @@ jobs:
echo "::set-env name=TAG::${TAG}"
- name: Set up env variables
run: |
base_version="2.3.3"
base_version="2.3.4"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
Expand Down Expand Up @@ -252,13 +252,11 @@ jobs:
docker manifest create esphome/esphome:${TAG} \
esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \
esphome/esphome-i386:${TAG}
esphome/esphome-armv7:${TAG}
docker manifest push esphome/esphome:${TAG}
docker manifest create esphome/esphome:dev \
esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \
esphome/esphome-i386:${TAG}
esphome/esphome-armv7:${TAG}
docker manifest push esphome/esphome:dev
13 changes: 5 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ jobs:
needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
strategy:
matrix:
arch: [amd64, i386, armv7, aarch64]
arch: [amd64, armv7, aarch64]
build_type: ["hassio", "docker"]
steps:
- uses: actions/checkout@v2
Expand All @@ -206,7 +206,7 @@ jobs:
echo "::set-env name=TAG::${TAG}"
- name: Set up env variables
run: |
base_version="2.3.3"
base_version="2.3.4"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
Expand Down Expand Up @@ -280,17 +280,15 @@ jobs:
docker manifest create esphome/esphome:${TAG} \
esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \
esphome/esphome-i386:${TAG}
esphome/esphome-armv7:${TAG}
docker manifest push esphome/esphome:${TAG}
- name: Publish docker beta tag
run: |
docker manifest create esphome/esphome:beta \
esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \
esphome/esphome-i386:${TAG}
esphome/esphome-armv7:${TAG}
docker manifest push esphome/esphome:beta
- name: Publish docker latest tag
Expand All @@ -299,6 +297,5 @@ jobs:
docker manifest create esphome/esphome:latest \
esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \
esphome/esphome-i386:${TAG}
esphome/esphome-armv7:${TAG}
docker manifest push esphome/esphome:latest
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.3
ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.4
FROM ${BUILD_FROM}

# First install requirements to leverage caching when requirements don't change
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM esphome/esphome-base-amd64:2.3.3
FROM esphome/esphome-base-amd64:2.3.4

COPY . .

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.lint
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM esphome/esphome-lint-base:2.3.3
FROM esphome/esphome-lint-base:2.3.4

COPY requirements.txt requirements_test.txt /
RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt
Expand Down

0 comments on commit ee549be

Please sign in to comment.