Skip to content

Commit d41adf1

Browse files
crschardtcrschardt
committed
test opi5
1 parent 4581143 commit d41adf1

File tree

5 files changed

+85
-76
lines changed

5 files changed

+85
-76
lines changed

‎.github/workflows/main.yml‎

Lines changed: 78 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
rubik:
16-
env:
17-
script: "./tmp/build/install_rubikpi3.sh"
18-
base_image: "https://people.canonical.com/~platform/images/qualcomm-iot/rubikpi3/ubuntu-server-24.04/x00/ubuntu-24.04-preinstalled-server-arm64+rubikpi3-20250912-127.yaml"
19-
image_name: "rubikpi3"
15+
# rubik:
16+
# env:
17+
# script: "./tmp/build/install_rubikpi3.sh"
18+
# base_image: "https://people.canonical.com/~platform/images/qualcomm-iot/rubikpi3/ubuntu-server-24.04/x00/ubuntu-24.04-preinstalled-server-arm64+rubikpi3-20250912-127.yaml"
19+
# image_name: "rubikpi3"
2020

21-
runs-on: ubuntu-24.04-arm
21+
# runs-on: ubuntu-24.04-arm
2222

23-
name: "Build for RubikPi3"
23+
# name: "Build for RubikPi3"
2424

25-
steps:
26-
- uses: actions/checkout@v4.1.7
27-
with:
28-
fetch-depth: 0
29-
- name: Fetch tags
30-
run: git fetch --tags --force
25+
# steps:
26+
# - uses: actions/checkout@v4.1.7
27+
# with:
28+
# fetch-depth: 0
29+
# - name: Fetch tags
30+
# run: git fetch --tags --force
3131

32-
- name: Build rubikpi3 with mounting
33-
run: |
34-
chmod +x ./mount_rubikpi3.sh
35-
./mount_rubikpi3.sh ${{ env.base_image }} ${{ env.script }}
32+
# - name: Build rubikpi3 with mounting
33+
# run: |
34+
# chmod +x ./mount_rubikpi3.sh
35+
# ./mount_rubikpi3.sh ${{ env.base_image }} ${{ env.script }}
3636

37-
- name: Compress built image
38-
run: |
39-
tar -I 'xz -T0' -cf photonvision_rubikpi3.tar.xz photonvision_rubikpi3 --checkpoint=10000 --checkpoint-action=echo='%T'
37+
# - name: Compress built image
38+
# run: |
39+
# tar -I 'xz -T0' -cf photonvision_rubikpi3.tar.xz photonvision_rubikpi3 --checkpoint=10000 --checkpoint-action=echo='%T'
4040

41-
- uses: actions/upload-artifact@v4.3.4
42-
with:
43-
name: photonvision_rubikpi3.tar.xz
44-
path: photonvision_rubikpi3.tar.xz
45-
if-no-files-found: error
46-
retention-days: 1
41+
# - uses: actions/upload-artifact@v4.3.4
42+
# with:
43+
# name: photonvision_rubikpi3.tar.xz
44+
# path: photonvision_rubikpi3.tar.xz
45+
# if-no-files-found: error
46+
# retention-days: 1
4747

4848
build:
4949
runs-on: ubuntu-24.04-arm
@@ -52,48 +52,48 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
include:
55-
- name: limelight
56-
script: ./install_limelight.sh
57-
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
58-
- name: limelight3
59-
script: ./install_limelight3.sh
60-
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
61-
- name: limelight3g
62-
script: ./install_limelight3g.sh
63-
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
64-
- name: limelight4
65-
script: ./install_limelight4.sh
66-
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
67-
- name: raspi
68-
script: ./install_pi.sh
69-
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
70-
- name: raspi_dev
71-
script: ./install_dev_pi.sh
72-
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
73-
- name: snakeyes
74-
script: ./install_snakeyes.sh
75-
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
76-
- name: luma_p1
77-
script: ./install_luma_p1.sh
78-
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
55+
# - name: limelight
56+
# script: ./install_limelight.sh
57+
# 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
58+
# - name: limelight3
59+
# script: ./install_limelight3.sh
60+
# 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
61+
# - name: limelight3g
62+
# script: ./install_limelight3g.sh
63+
# 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
64+
# - name: limelight4
65+
# script: ./install_limelight4.sh
66+
# 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
67+
# - name: raspi
68+
# script: ./install_pi.sh
69+
# 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
70+
# - name: raspi_dev
71+
# script: ./install_dev_pi.sh
72+
# 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
73+
# - name: snakeyes
74+
# script: ./install_snakeyes.sh
75+
# 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
76+
# - name: luma_p1
77+
# script: ./install_luma_p1.sh
78+
# 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
7979
- name: opi5
8080
script: ./install_opi5.sh
8181
base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5.img.xz
82-
- name: opi5b
83-
script: ./install_opi5.sh
84-
base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz
85-
- name: opi5plus
86-
script: ./install_opi5.sh
87-
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
88-
- name: opi5pro
89-
script: ./install_opi5.sh
90-
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
91-
- name: opi5max
92-
script: ./install_opi5.sh
93-
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
94-
- name: rock5c
95-
script: ./install_opi5.sh
96-
base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz
82+
# - name: opi5b
83+
# script: ./install_opi5.sh
84+
# base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-orangepi-5b.img.xz
85+
# - name: opi5plus
86+
# script: ./install_opi5.sh
87+
# 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
88+
# - name: opi5pro
89+
# script: ./install_opi5.sh
90+
# 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
91+
# - name: opi5max
92+
# script: ./install_opi5.sh
93+
# 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
94+
# - name: rock5c
95+
# script: ./install_opi5.sh
96+
# base_image: https://github.com/Joshua-Riek/ubuntu-rockchip/releases/download/v2.4.0/ubuntu-24.04-preinstalled-server-arm64-rock-5c.img.xz
9797

9898
name: "Build for ${{ matrix.name }}"
9999
env:
@@ -107,10 +107,18 @@ jobs:
107107
run: git fetch --tags --force
108108

109109
- name: Install dependencies and build image
110+
uses: photonvision/photon-image-runner@HEAD
110111
id: install_deps
111-
run: |
112-
sudo chmod +x ./mount_image.sh
113-
sudo -E ./mount_image.sh ${{ matrix.base_image }} ${{ matrix.script }} 1000 2
112+
with:
113+
additional_mb: 1500
114+
image_url: ${{ matrix.base_image }}
115+
commands: |
116+
echo "Running ${{ matrix.script }}"
117+
chmod +x "${{ matrix.script }}"
118+
"./${{ matrix.script }}"
119+
echo "Running install_common.sh"
120+
chmod +x "./install_common.sh"
121+
"./install_common.sh"
114122
115123
- name: Compress built image
116124
run: |
@@ -125,7 +133,8 @@ jobs:
125133
retention-days: 1
126134

127135
release:
128-
needs: [build, rubik]
136+
# needs: [build, rubik]
137+
needs: [build]
129138
runs-on: ubuntu-24.04
130139
steps:
131140
# Download literally every single artifact

‎install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Exit on errors
4-
set -e
4+
set -e +u
55

66
needs_arg() {
77
if [ -z "$OPTARG" ]; then

‎install_common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# Verbose and exit on errors
3-
set -ex
3+
# set -ex
44

55
# Do additional tasks that are common across all images,
66
# but not suitable for inclusion in install.sh

‎install_opi5.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
2-
2+
set +u
33
# Verbose and exit on errors
4-
set -ex
4+
# set -ex
55

66
# Create pi/raspberry login
7-
if id "$1" >/dev/null 2>&1; then
7+
if id "pi" >/dev/null 2>&1; then
88
echo 'user found'
99
else
1010
echo "creating pi user"

‎install_pi.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash -v
1+
#!/bin/bash
22

33
# Verbose and exit on errors
4-
set -ex
4+
# set -ex
55

66
# silence log spam from dpkg
77
cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF

0 commit comments

Comments
 (0)