Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 13:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove i386 arch

Browse source 
See also https://github.com/esphome/esphome-docker-base/issues/5
This commit is contained in:
Otto Winter 2020-07-15 21:42:12 +02:00
parent d9c33f19e2
commit 8166d0de79
No known key found for this signature in database
GPG key ID: 48ED2DDB96D7682C
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/release-dev.yml vendored
View file

@ -176,7 +176,7 @@ jobs:
needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest] needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
strategy: strategy:
matrix: matrix:
arch: [amd64, i386, armv7, aarch64] arch: [amd64, armv7, aarch64]
# Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly # Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly
build_type: ["docker"] build_type: ["docker"]
steps: steps:
@ -187,7 +187,7 @@ jobs:
echo "::set-env name=TAG::${TAG}" echo "::set-env name=TAG::${TAG}"
- name: Set up env variables - name: Set up env variables
run: | run: |
base_version="2.3.3" base_version="2.3.4"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
@ -252,13 +252,11 @@ jobs:
docker manifest create esphome/esphome:${TAG} \ docker manifest create esphome/esphome:${TAG} \
esphome/esphome-aarch64:${TAG} \ esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \ esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \ esphome/esphome-armv7:${TAG}
esphome/esphome-i386:${TAG}
docker manifest push esphome/esphome:${TAG} docker manifest push esphome/esphome:${TAG}
docker manifest create esphome/esphome:dev \ docker manifest create esphome/esphome:dev \
esphome/esphome-aarch64:${TAG} \ esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \ esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \ esphome/esphome-armv7:${TAG}
esphome/esphome-i386:${TAG}
docker manifest push esphome/esphome:dev docker manifest push esphome/esphome:dev

13
.github/workflows/release.yml vendored
View file

@ -196,7 +196,7 @@ jobs:
needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest] needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
strategy: strategy:
matrix: matrix:
arch: [amd64, i386, armv7, aarch64] arch: [amd64, armv7, aarch64]
build_type: ["hassio", "docker"] build_type: ["hassio", "docker"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -206,7 +206,7 @@ jobs:
echo "::set-env name=TAG::${TAG}" echo "::set-env name=TAG::${TAG}"
- name: Set up env variables - name: Set up env variables
run: | run: |
base_version="2.3.3" base_version="2.3.4"
if [[ "${{ matrix.build_type }}" == "hassio" ]]; then if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}" build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
@ -280,8 +280,7 @@ jobs:
docker manifest create esphome/esphome:${TAG} \ docker manifest create esphome/esphome:${TAG} \
esphome/esphome-aarch64:${TAG} \ esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \ esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \ esphome/esphome-armv7:${TAG}
esphome/esphome-i386:${TAG}
docker manifest push esphome/esphome:${TAG} docker manifest push esphome/esphome:${TAG}
- name: Publish docker beta tag - name: Publish docker beta tag
@ -289,8 +288,7 @@ jobs:
docker manifest create esphome/esphome:beta \ docker manifest create esphome/esphome:beta \
esphome/esphome-aarch64:${TAG} \ esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \ esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \ esphome/esphome-armv7:${TAG}
esphome/esphome-i386:${TAG}
docker manifest push esphome/esphome:beta docker manifest push esphome/esphome:beta
- name: Publish docker latest tag - name: Publish docker latest tag
@ -299,6 +297,5 @@ jobs:
docker manifest create esphome/esphome:latest \ docker manifest create esphome/esphome:latest \
esphome/esphome-aarch64:${TAG} \ esphome/esphome-aarch64:${TAG} \
esphome/esphome-amd64:${TAG} \ esphome/esphome-amd64:${TAG} \
esphome/esphome-armv7:${TAG} \ esphome/esphome-armv7:${TAG}
esphome/esphome-i386:${TAG}
docker manifest push esphome/esphome:latest docker manifest push esphome/esphome:latest

2
docker/Dockerfile
View file

@ -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} FROM ${BUILD_FROM}
# First install requirements to leverage caching when requirements don't change # First install requirements to leverage caching when requirements don't change

2
docker/Dockerfile.dev
View file

@ -1,4 +1,4 @@
FROM esphome/esphome-base-amd64:2.3.3 FROM esphome/esphome-base-amd64:2.3.4
COPY . . COPY . .

2
docker/Dockerfile.lint
View file

@ -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 / COPY requirements.txt requirements_test.txt /
RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt