Skip to content

Commit 7c6b282

Browse files
committed
ci: Build latest skopeo for ubuntu
So that we can drop support for the hacky "copy to temporary OCI" code. Signed-off-by: Colin Walters <[email protected]>
1 parent d720fdd commit 7c6b282

File tree

1 file changed

+29
-6
lines changed

1 file changed

+29
-6
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,45 @@ jobs:
116116
run: sudo tar -C / -xvf bootc.tar.zst
117117
- name: Integration tests
118118
run: bootc internal-tests run-container-integration
119+
build-skopeo-ubuntu:
120+
name: "Build skopeo git main for ubuntu"
121+
runs-on: ubuntu-latest
122+
steps:
123+
- uses: actions/checkout@v3
124+
with:
125+
repository: containers/skopeo
126+
path: skopeo
127+
- name: Install build deps
128+
run: |
129+
sudo sed -ie s,'# deb-src,deb-src,' /etc/apt/sources.list
130+
sudo apt update
131+
sudo apt build-dep -y skopeo
132+
- uses: actions/setup-go@v4
133+
with:
134+
go-version: '>=1.20'
135+
- name: Build skopeo
136+
run: cd skopeo && make bin/skopeo PREFIX=/usr
137+
- name: Upload binary
138+
uses: actions/upload-artifact@v4
139+
with:
140+
name: skopeo-ubuntu
141+
path: skopeo/bin/skopeo
119142
privtest-alongside:
120143
name: "Test install-alongside"
121-
needs: build-fedora
144+
needs: [build-fedora, build-skopeo-ubuntu]
122145
runs-on: ubuntu-latest
123146
steps:
147+
- name: Download
148+
uses: actions/download-artifact@v4
149+
with:
150+
name: skopeo-ubuntu
151+
- run: chmod a+x skopeo && sudo mv skopeo /usr/bin
124152
- name: Download
125153
uses: actions/download-artifact@v3
126154
with:
127155
name: bootc.tar.zst
128156
- name: Install
129157
run: tar -xvf bootc.tar.zst
130-
- name: Update host skopeo
131-
run: |
132-
echo 'deb http://cz.archive.ubuntu.com/ubuntu lunar main universe' | sudo tee -a /etc/apt/sources.list
133-
sudo apt update
134-
sudo apt upgrade skopeo
135158
- name: Integration tests
136159
run: |
137160
set -xeuo pipefail

0 commit comments

Comments
 (0)