From bc681bb81cc447110f49f4c939d381789eaf28f7 Mon Sep 17 00:00:00 2001 From: Craig Schardt Date: Fri, 13 Dec 2024 15:28:00 -0600 Subject: [PATCH 1/4] uses env var for image version --- .github/workflows/main.yml | 66 ++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43455c6..2c5a2f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,45 +9,47 @@ on: jobs: build: + env: + jr_image_path: 'https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download' + jr_image_version: 'v2.4.0' runs-on: ubuntu-latest - strategy: fail-fast: false matrix: include: - - name: limelight - script: ./install_limelight.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: limelight3 - script: ./install_limelight3.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: raspi - script: ./install_pi.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: raspi_dev - script: ./install_dev_pi.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - - name: snakeyes - script: ./install_snakeyes.sh - base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: limelight + # script: ./install_limelight.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: limelight3 + # script: ./install_limelight3.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: raspi + # script: ./install_pi.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: raspi_dev + # script: ./install_dev_pi.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + # - name: snakeyes + # script: ./install_snakeyes.sh + # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - name: opi5 script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz - - name: opi5b - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz - - name: opi5plus - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz - - name: opi5pro - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-pro.img.xz - - name: opi5max - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.1/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-max.img.xz - - name: rock5c - script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.1/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz + base_image: ${{jr_image_path}}/${{jr_image_version}}/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz + # - name: opi5b + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz + # - name: opi5plus + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz + # - name: opi5pro + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-pro.img.xz + # - name: opi5max + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.1/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-max.img.xz + # - name: rock5c + # script: ./install_opi5.sh + # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.1/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz name: "Build for ${{ matrix.name }}" From 4a4dc43c5282ce505bce13ca851a4ec34587768b Mon Sep 17 00:00:00 2001 From: Craig Schardt Date: Fri, 13 Dec 2024 15:53:24 -0600 Subject: [PATCH 2/4] maybe this? --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c5a2f4..58badc8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,13 +6,16 @@ on: - 'v*' pull_request: branches: [ master ] - + env: + # jr_image_path: 'https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download' + jr_image_version: 'v2.4.0' jobs: build: env: - jr_image_path: 'https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download' + # jr_image_path: 'https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download' jr_image_version: 'v2.4.0' runs-on: ubuntu-latest + strategy: fail-fast: false matrix: @@ -34,7 +37,7 @@ jobs: # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - name: opi5 script: ./install_opi5.sh - base_image: ${{jr_image_path}}/${{jr_image_version}}/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/${{ env.jr_image_version }}/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz # - name: opi5b # script: ./install_opi5.sh # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz From 766731c4ec1ae10d5a8a8ac9492863cb950b7327 Mon Sep 17 00:00:00 2001 From: Craig Schardt Date: Fri, 13 Dec 2024 16:02:40 -0600 Subject: [PATCH 3/4] looks like env var isn't supported here --- .github/workflows/main.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 58badc8..5e5de3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,14 +6,9 @@ on: - 'v*' pull_request: branches: [ master ] - env: - # jr_image_path: 'https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download' - jr_image_version: 'v2.4.0' + jobs: build: - env: - # jr_image_path: 'https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download' - jr_image_version: 'v2.4.0' runs-on: ubuntu-latest strategy: @@ -37,7 +32,7 @@ jobs: # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - name: opi5 script: ./install_opi5.sh - base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/${{ env.jr_image_version }}/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz # - name: opi5b # script: ./install_opi5.sh # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz From 8a817d730b01c79b081d396eaad68bd8e37153ee Mon Sep 17 00:00:00 2001 From: Craig Schardt Date: Fri, 13 Dec 2024 16:49:31 -0600 Subject: [PATCH 4/4] this should work --- .github/workflows/main.yml | 60 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5e5de3e..7818f31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,39 +15,39 @@ jobs: fail-fast: false matrix: include: - # - name: limelight - # script: ./install_limelight.sh - # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - # - name: limelight3 - # script: ./install_limelight3.sh - # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - # - name: raspi - # script: ./install_pi.sh - # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - # - name: raspi_dev - # script: ./install_dev_pi.sh - # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - # - name: snakeyes - # script: ./install_snakeyes.sh - # base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + - name: limelight + script: ./install_limelight.sh + base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + - name: limelight3 + script: ./install_limelight3.sh + base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + - name: raspi + script: ./install_pi.sh + base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + - name: raspi_dev + script: ./install_dev_pi.sh + base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz + - name: snakeyes + script: ./install_snakeyes.sh + base_image: https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/2024-07-04-raspios-bookworm-arm64-lite.img.xz - name: opi5 script: ./install_opi5.sh base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz - # - name: opi5b - # script: ./install_opi5.sh - # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz - # - name: opi5plus - # script: ./install_opi5.sh - # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz - # - name: opi5pro - # script: ./install_opi5.sh - # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-pro.img.xz - # - name: opi5max - # script: ./install_opi5.sh - # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.1/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-max.img.xz - # - name: rock5c - # script: ./install_opi5.sh - # base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.3.1/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz + - name: opi5b + script: ./install_opi5.sh + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz + - name: opi5plus + script: ./install_opi5.sh + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-plus.img.xz + - name: opi5pro + script: ./install_opi5.sh + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-pro.img.xz + - name: opi5max + script: ./install_opi5.sh + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5-max.img.xz + - name: rock5c + script: ./install_opi5.sh + base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz name: "Build for ${{ matrix.name }}"