Skip to content

Commit 220d026

Browse files
authored
chore: Migrate to Ultramarine builder and local keys
* chore: Begin the process of migrating to local keys * Oh boy * ? * Update ultramarine.tpl * feat: Switch to UM builder * Update ultramarine.tpl * ? * cleanup: Don't need * feat: Swap to metalinks * [rawhide] feat: Use local keys and metalinks * chore: Swap back to baseurl * fix: Disable fail-fast becase GitHub is ridiculously buggy
1 parent 7ae9c7b commit 220d026

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-latest' }}
2121
container:
22-
image: ghcr.io/terrapkg/builder:f${{ matrix.releasever }}
22+
image: ghcr.io/ultramarine-linux/builder:um${{ matrix.releasever }}
2323
options: --cap-add=SYS_ADMIN --privileged
2424
steps:
2525
- name: Checkout Ultramarine repository

ultramarine-rawhide.tpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-pr
4747
4848
[ultramarine]
4949
name=Ultramarine Linux $releasever
50-
baseurl=https://repos.fyralabs.com/um$releasever/
50+
baseurl=https://repos.fyralabs.com/um$releasever
5151
type=rpm-md
5252
skip_if_unavailable=False
5353
gpgcheck=1
54-
gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
54+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-um$releasever
5555
repo_gpgcheck=1
5656
enabled=1
5757
enabled_metadata=1
@@ -63,31 +63,31 @@ baseurl=https://repos.fyralabs.com/terra$releasever
6363
type=rpm-md
6464
skip_if_unavailable=False
6565
gpgcheck=1
66-
gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
66+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-terra$releasever
6767
repo_gpgcheck=1
6868
enabled=1
6969
enabled_metadata=1
7070
#metadata_expire=4h
7171
7272
[terra-extras]
7373
name=Terra $releasever (Extras)
74-
metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-extras&arch=$basearch
74+
baseurl=https://repos.fyralabs.com/terra$releasever-extras
7575
type=rpm
7676
gpgcheck=1
7777
repo_gpgcheck=1
78-
gpgkey=https://repos.fyralabs.com/terra$releasever-extras/key.asc
78+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-terra$releasever-extras
7979
enabled=1
8080
priority=150
8181
enabled_metadata=1
8282
metadata_expire=0
8383
8484
[terra-mesa]
8585
name=Terra $releasever (Mesa)
86-
metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-mesa&arch=$basearch
86+
baseurl=https://repos.fyralabs.com/terra$releasever-mesa
8787
type=rpm
8888
gpgcheck=1
8989
repo_gpgcheck=1
90-
gpgkey=https://repos.fyralabs.com/terra$releasever-mesa/key.asc
90+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-terra$releasever-mesa
9191
enabled=1
9292
enabled_metadata=1
9393
metadata_expire=0

ultramarine.tpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ user_agent={{ user_agent }}
3737
3838
[ultramarine]
3939
name=Ultramarine Linux $releasever
40-
baseurl=https://repos.fyralabs.com/um$releasever/
40+
baseurl=https://repos.fyralabs.com/um$releasever
4141
type=rpm-md
4242
skip_if_unavailable=False
4343
gpgcheck=1
44-
gpgkey=https://repos.fyralabs.com/um$releasever/key.asc
44+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-um$releasever
4545
repo_gpgcheck=1
4646
enabled=1
4747
enabled_metadata=1
@@ -53,31 +53,31 @@ baseurl=https://repos.fyralabs.com/terra$releasever
5353
type=rpm-md
5454
skip_if_unavailable=False
5555
gpgcheck=1
56-
gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
56+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-terra$releasever
5757
repo_gpgcheck=1
5858
enabled=1
5959
enabled_metadata=1
6060
#metadata_expire=4h
6161
6262
[terra-extras]
6363
name=Terra $releasever (Extras)
64-
metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-extras&arch=$basearch
64+
baseurl=https://repos.fyralabs.com/terra$releasever-extras
6565
metadata_expire=6h
6666
type=rpm
6767
gpgcheck=1
68-
gpgkey=https://repos.fyralabs.com/terra$releasever-extras/key.asc
68+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-terra$releasever-extras
6969
repo_gpgcheck=1
7070
enabled=1
7171
enabled_metadata=1
7272
priority=150
7373
7474
[terra-mesa]
7575
name=Terra $releasever (Mesa)
76-
metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-mesa&arch=$basearch
76+
baseurl=https://repos.fyralabs.com/terra$releasever-mesa
7777
metadata_expire=6h
7878
type=rpm
7979
gpgcheck=1
80-
gpgkey=https://repos.fyralabs.com/terra$releasever-mesa/key.asc
80+
gpgkey=file:///etc/pki/mock/RPM-GPG-KEY-terra$releasever-mesa
8181
repo_gpgcheck=1
8282
enabled=1
8383
enabled_metadata=1

0 commit comments

Comments
 (0)