Skip to content

Commit f091ec6

Browse files
Merge pull request #68 from yuravk/master
CI: use ubuntu-24.04 runner instead of ubuntu-latest
2 parents 56eaf7e + c4a48ff commit f091ec6

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.github/workflows/build-rpi-github-hosted.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ on:
5858
jobs:
5959
build-image:
6060
name: ${{ inputs.version_major }} '${{ matrix.image_types }}' ${{ matrix.partitioning }} image
61-
runs-on: ubuntu-latest
61+
runs-on: ubuntu-24.04
6262
strategy:
6363
fail-fast: false
6464
matrix:
@@ -150,19 +150,23 @@ jobs:
150150
151151
- name: Install Vagrant
152152
run: |
153+
# Use Vagrant packages provided by Hashicorp as ubuntu-24.04 doesn't build ones
154+
wget -O - https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
155+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
156+
sudo apt-get -y update
153157
sudo apt-get -y install vagrant
154-
sudo vagrant --version
158+
155159
sudo vagrant plugin install vagrant-reload
156160
sudo vagrant plugin install vagrant-env
157161
158162
- name: Install libvirt Plugin for Vagrant
159163
run: |
160-
sudo cp /etc/apt/sources.list /etc/apt/sources.list."$(date +"%F")"
161-
sudo sed -i -e '/^# deb-src.*universe$/s/# //g' /etc/apt/sources.list
164+
sudo cp /etc/apt/sources.list.d/ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources."$(date +"%F")"
165+
sudo sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
162166
sudo apt-get -y update
163167
sudo apt-get -y install nfs-kernel-server
164168
sudo systemctl enable --now nfs-server
165-
sudo apt-get -y build-dep vagrant ruby-libvirt
169+
sudo apt-get -y build-dep ruby-libvirt
166170
sudo apt-get -y install ebtables dnsmasq-base
167171
sudo apt-get -y install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev
168172
sudo vagrant plugin install vagrant-libvirt
@@ -278,7 +282,11 @@ jobs:
278282
EOF
279283
280284
- name: Run vagrant up
281-
run: sudo vagrant up fedora
285+
run: |
286+
# TODO to solve "undefined method `exists?'" error
287+
sudo sed -i 's/exists?/exist?/g' /root/.vagrant.d/gems/3.3.6/gems/dotenv-0.11.1/lib/dotenv.rb
288+
289+
sudo vagrant up fedora
282290
283291
- name: Tune SElinux
284292
run: |

.github/workflows/build-rpi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
start-runner:
6161
timeout-minutes: 10 # normally it only takes 1-2 minutes
6262
name: EC2 runner for '${{ matrix.image_types }}' ${{ matrix.partitioning }}
63-
runs-on: ubuntu-latest
63+
runs-on: ubuntu-24.04
6464
permissions:
6565
actions: write
6666
strategy:

0 commit comments

Comments
 (0)