Skip to content

Commit a3cda03

Browse files
Rippanda12Rippanda12
committed
final
1 parent 231ba00 commit a3cda03

File tree

2 files changed

+6
-125
lines changed

2 files changed

+6
-125
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 4 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
version_full: ${{ steps.version.outputs.version_full }}
3535
channel: ${{ steps.channel.outputs.channel }}
3636
matrix: ${{ steps.generate_matrix.outputs.result }}
37-
build_container_image: ghcr.io/${{ github.repository_owner }}/haos-builder@${{ steps.build_haos_builder.outputs.digest }}
37+
build_container_image: ghcr.io/home-assistant/haos-builder@${{ steps.build_haos_builder.outputs.digest }}
3838
publish_build: ${{ steps.check_publish.outputs.publish_build }}
3939
self_signed_cert: ${{ steps.generate_signing_key.outputs.self_signed_cert }}
4040
steps:
@@ -149,9 +149,9 @@ jobs:
149149
with:
150150
context: .
151151
file: Dockerfile
152-
tags: ghcr.io/${{ github.repository_owner }}/haos-builder
153-
cache-from: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
154-
cache-to: ghcr.io/${{ github.repository_owner }}/haos-builder:cache-${{ steps.version.outputs.version_main }}
152+
tags: ghcr.io/home-assistant/haos-builder
153+
cache-from: ghcr.io/home-assistant/haos-builder:cache-${{ steps.version.outputs.version_main }}
154+
cache-to: ghcr.io/ameridroid/haos-builder:cache-${{ steps.version.outputs.version_main }}
155155
push: true
156156

157157
- name: Generate self-signed certificate
@@ -268,20 +268,6 @@ jobs:
268268
make -C buildroot O="/build/output" BR2_EXTERNAL="/build/buildroot-external" \
269269
BR2_CHECK_DOTCONFIG_OPTS="--github-format --strip-path-prefix=/build/" linux-check-dotconfig
270270
271-
- name: Upload artifacts
272-
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
273-
working-directory: output/images/
274-
env:
275-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
276-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
277-
run: |
278-
aws s3 sync \
279-
./ \
280-
s3://${{ secrets.R2_OS_ARTIFACTS_BUCKET }}/${{ needs.prepare.outputs.version_full }}/ \
281-
--exclude "*" \
282-
--include "haos_*" \
283-
--endpoint-url ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
284-
285271
- name: Upload release assets
286272
if: ${{ github.event_name == 'release' }}
287273
uses: shogo82148/actions-upload-release-asset@v1
@@ -336,109 +322,4 @@ jobs:
336322
path: |
337323
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.raucb
338324
339-
- name: Upload Open Virtualization Format (OVA) artifact
340-
uses: actions/upload-artifact@v4
341-
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
342-
with:
343-
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
344-
path: |
345-
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.ova
346325
347-
- name: Upload QEMU disk image artifact
348-
uses: actions/upload-artifact@v4
349-
# Create artifact for ova every time - it's used by the called tests workflow
350-
if: ${{ matrix.board.id == 'ova' || (github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'generic-aarch64') }}
351-
with:
352-
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
353-
path: |
354-
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.qcow2.xz
355-
356-
- name: Upload VMware Virtual Machine Disk (VMDK) artifact
357-
uses: actions/upload-artifact@v4
358-
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && (matrix.board.id == 'generic-aarch64' || matrix.board.id == 'ova') }}
359-
with:
360-
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
361-
path: |
362-
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vmdk.zip
363-
364-
- name: Upload VirtualBox Virtual Disk Image (VDI) artifact
365-
uses: actions/upload-artifact@v4
366-
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
367-
with:
368-
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
369-
path: |
370-
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vdi.zip
371-
372-
- name: Upload Virtual Hard Disk v2 (VHDX) artifact
373-
uses: actions/upload-artifact@v4
374-
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build != 'true' && matrix.board.id == 'ova' }}
375-
with:
376-
name: haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
377-
path: |
378-
output/images/haos_${{ matrix.board.id }}-${{ needs.prepare.outputs.version_full }}.vhdx.zip
379-
380-
test:
381-
name: Test OS image
382-
needs: [ build, prepare ]
383-
uses: ./.github/workflows/test.yaml
384-
with:
385-
version: ${{ needs.prepare.outputs.version_full }}
386-
387-
update_index:
388-
name: Update artifacts index
389-
if: ${{ github.event_name != 'release' && needs.prepare.outputs.publish_build == 'true' }}
390-
needs: [ build, prepare ]
391-
uses: home-assistant/operating-system/.github/workflows/artifacts-index.yaml@dev
392-
with:
393-
version: ${{ needs.prepare.outputs.version_full }}
394-
secrets:
395-
R2_OS_ARTIFACTS_ID: ${{ secrets.R2_OS_ARTIFACTS_ID }}
396-
R2_OS_ARTIFACTS_KEY: ${{ secrets.R2_OS_ARTIFACTS_KEY }}
397-
R2_OS_ARTIFACTS_BUCKET: ${{ secrets.R2_OS_ARTIFACTS_BUCKET }}
398-
R2_OS_ARTIFACTS_ENDPOINT: ${{ secrets.R2_OS_ARTIFACTS_ENDPOINT }}
399-
CF_ZONE: ${{ secrets.CF_ZONE }}
400-
CF_PURGE_TOKEN: ${{ secrets.CF_PURGE_TOKEN }}
401-
402-
bump_version:
403-
name: Bump ${{ needs.prepare.outputs.channel }} channel version
404-
if: ${{ github.repository == 'home-assistant/operating-system' && needs.prepare.outputs.publish_build == 'true' }}
405-
environment: ${{ needs.prepare.outputs.channel }}
406-
needs: [ build, prepare ]
407-
runs-on: ubuntu-22.04
408-
409-
steps:
410-
- name: Checkout source
411-
uses: actions/checkout@v4
412-
with:
413-
persist-credentials: false
414-
415-
- name: Initialize git
416-
uses: home-assistant/actions/helpers/git-init@master
417-
with:
418-
name: ${{ secrets.GIT_NAME }}
419-
email: ${{ secrets.GIT_EMAIL }}
420-
token: ${{ secrets.GIT_TOKEN }}
421-
422-
- name: Bump Home Assistant OS ${{ needs.prepare.outputs.channel }} channel version
423-
uses: home-assistant/actions/helpers/version-push@master
424-
with:
425-
key: "hassos[]"
426-
key-description: "Home Assistant OS"
427-
version: ${{ needs.prepare.outputs.version_full }}
428-
channel: ${{ needs.prepare.outputs.channel }}
429-
430-
- name: Bump Home Assistant OS beta channel version on stable release
431-
if: ${{ needs.prepare.outputs.channel == 'stable' }}
432-
uses: home-assistant/actions/helpers/version-push@master
433-
with:
434-
key: "hassos[]"
435-
key-description: "Home Assistant OS"
436-
version: ${{ needs.prepare.outputs.version_full }}
437-
channel: beta
438-
439-
- name: Bump stable Home Assistant version for RPi Imager
440-
if: ${{ github.event_name == 'release' && needs.prepare.outputs.channel == 'stable' }}
441-
uses: "./.github/actions/bump-rpi-imager-version"
442-
with:
443-
version: ${{ needs.prepare.outputs.version_full }}
444-
release-date: ${{ github.event.release.published_at }}

‎buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -e
1212
SUPERVISOR_DATA=/mnt/data/supervisor
1313
SUPERVISOR_STARTUP_MARKER="/run/supervisor/startup-marker"
1414
SUPERVISOR_STARTSCRIPT_VERSION="/mnt/data/.hassos-supervisor-version"
15-
SUPERVISOR_IMAGE="ghcr.io/home-assistant/${SUPERVISOR_ARCH}-hassio-supervisor"
15+
SUPERVISOR_IMAGE="ghcr.io/ameridroid/${SUPERVISOR_ARCH}-hassio-supervisor"
1616

1717
SUPERVISOR_IMAGE_ID=$(docker images --no-trunc --filter "reference=${SUPERVISOR_IMAGE}:latest" --format "{{.ID}}" || echo "")
1818
SUPERVISOR_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
@@ -47,7 +47,7 @@ if [ -z "${SUPERVISOR_IMAGE_ID}" ]; then
4747
# Get version from stable channel in case we have no local version
4848
# information.
4949
if [ "${SUPERVISOR_VERSION}" = "stable" ]; then
50-
SUPERVISOR_VERSION="$(curl -s --location https://version.home-assistant.io/stable.json | jq -e -r '.supervisor')"
50+
SUPERVISOR_VERSION="$(curl -s --location https://ameridroid.github.io/HA-version/stable.json | jq -e -r '.supervisor')"
5151
fi
5252

5353
echo "[WARNING] Supervisor image missing, downloading a fresh one: ${SUPERVISOR_VERSION}"

0 commit comments

Comments
 (0)