Skip to content

Commit 9a5b287

Browse files
bilelmoussaouibilelmoussaoui
committed
Recommend images from flathub
1 parent fc80c13 commit 9a5b287

File tree

9 files changed

+25
-249
lines changed

9 files changed

+25
-249
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 0 additions & 183 deletions
This file was deleted.

‎.github/workflows/flatpak-test.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Flatpak Builder
1010
runs-on: ubuntu-latest
1111
container:
12-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
12+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
1313
options: --privileged
1414
strategy:
1515
fail-fast: false
@@ -26,10 +26,14 @@ jobs:
2626
restore: cache-restored
2727
steps:
2828
- uses: actions/checkout@v4
29-
- name: Install QEMU deps
29+
# Docker is required by the docker/setup-qemu-action which enables emulation
30+
- name: Install deps
3031
if: ${{ matrix.arch != 'x86_64' }}
3132
run: |
32-
dnf -y install docker
33+
# Use the static binaries because it's unable to use a package manager
34+
curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
35+
tar xzvf docker.tgz
36+
mv docker/* /usr/bin
3337
- name: Set up QEMU
3438
if: ${{ matrix.arch != 'x86_64' }}
3539
uses: docker/setup-qemu-action@v2
@@ -55,7 +59,7 @@ jobs:
5559
name: Flatpak Builder Stop At
5660
runs-on: ubuntu-latest
5761
container:
58-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
62+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
5963
options: --privileged
6064
steps:
6165
- uses: actions/checkout@v4
@@ -71,7 +75,7 @@ jobs:
7175
runs-on: ubuntu-latest
7276
needs: flatpak-builder
7377
container:
74-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
78+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
7579
options: --privileged
7680
steps:
7781
- uses: actions/checkout@v4

‎Dockerfile‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎README.md‎

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: "Flatpak"
2828
runs-on: ubuntu-latest
2929
container:
30-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
30+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
3131
options: --privileged
3232
steps:
3333
- uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
7676
name: "Flatpak"
7777
runs-on: ubuntu-latest
7878
container:
79-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
79+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
8080
options: --privileged
8181
strategy:
8282
matrix:
@@ -89,7 +89,10 @@ jobs:
8989
- name: Install deps
9090
if: ${{ matrix.arch != 'x86_64' }}
9191
run: |
92-
dnf -y install docker
92+
# Use the static binaries because it's unable to use a package manager
93+
curl https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz --output ./docker.tgz
94+
tar xzvf docker.tgz
95+
mv docker/* /usr/bin
9396
- name: Set up QEMU
9497
if: ${{ matrix.arch != 'x86_64' }}
9598
id: qemu
@@ -161,7 +164,7 @@ jobs:
161164
name: "Flatpak"
162165
runs-on: ubuntu-latest
163166
container:
164-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
167+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
165168
options: --privileged
166169
steps:
167170
- uses: actions/checkout@v4
@@ -193,41 +196,6 @@ jobs:
193196
| `build-log-url` | URL to Flatpak build log | Optional | - |
194197
| `verbose` | Enable verbosity | Optional | `false` |
195198

196-
### Docker Image
197-
198-
The Docker image used for the action consists of 2 parts: The base image, based on Fedora and which can be found
199-
[here](./Dockerfile), and the specific image of the runtime you choose, which is generated through
200-
[this](.github/workflows/docker.yml) GitHub Actions workflow.
201-
202-
You can specify the specific runtime you need to use through the image tags:
203-
204-
| Runtime | Version | Tag | Example |
205-
| --------------- | ------- | ------------------- | ---------------------------------------------------------------- |
206-
| Freedesktop SDK | 20.08 | `freedesktop-20.08` | `image: bilelmoussaoui/flatpak-github-actions:freedesktop-20.08` |
207-
| Freedesktop SDK | 21.08 | `freedesktop-21.08` | `image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08` |
208-
| Freedesktop SDK | 22.08 | `freedesktop-22.08` | `image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08` |
209-
| Freedesktop SDK | 23.08 | `freedesktop-23.08` | `image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08` |
210-
| Freedesktop SDK | 24.08 | `freedesktop-24.08` | `image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08` |
211-
| GNOME | 3.38 | `gnome-3.38` | `image: bilelmoussaoui/flatpak-github-actions:gnome-3.38` |
212-
| GNOME | 40 | `gnome-40` | `image: bilelmoussaoui/flatpak-github-actions:gnome-40` |
213-
| GNOME | 41 | `gnome-41` | `image: bilelmoussaoui/flatpak-github-actions:gnome-41` |
214-
| GNOME | 42 | `gnome-42` | `image: bilelmoussaoui/flatpak-github-actions:gnome-42` |
215-
| GNOME | 43 | `gnome-43` | `image: bilelmoussaoui/flatpak-github-actions:gnome-43` |
216-
| GNOME | 44 | `gnome-44` | `image: bilelmoussaoui/flatpak-github-actions:gnome-44` |
217-
| GNOME | 45 | `gnome-45` | `image: bilelmoussaoui/flatpak-github-actions:gnome-45` |
218-
| GNOME | 46 | `gnome-46` | `image: bilelmoussaoui/flatpak-github-actions:gnome-46` |
219-
| GNOME | 47 | `gnome-47` | `image: bilelmoussaoui/flatpak-github-actions:gnome-47` |
220-
| GNOME | master | `gnome-nightly` | `image: bilelmoussaoui/flatpak-github-actions:gnome-nightly` |
221-
| KDE | 5.15 | `kde-5.15` | `image: bilelmoussaoui/flatpak-github-actions:kde-5.15` |
222-
| KDE | 5.15-21.08 | `kde-5.15-21.08` | `image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08` |
223-
| KDE | 5.15-22.08 | `kde-5.15-22.08` | `image: bilelmoussaoui/flatpak-github-actions:kde-5.15-22.08` |
224-
| KDE | 5.15-23.08 | `kde-5.15-23.08` | `image: bilelmoussaoui/flatpak-github-actions:kde-5.15-23.08` |
225-
| KDE | 5.15-24.08 | `kde-5.15-24.08` | `image: bilelmoussaoui/flatpak-github-actions:kde-5.15-24.08` |
226-
| KDE | 6.2 | `kde-6.2` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.2` |
227-
| KDE | 6.3 | `kde-6.3` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.3` |
228-
| KDE | 6.4 | `kde-6.4` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.4` |
229-
| KDE | 6.5 | `kde-6.5` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.5` |
230-
| KDE | 6.6 | `kde-6.6` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.6` |
231-
| KDE | 6.7 | `kde-6.7` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.7` |
232-
| KDE | 6.8 | `kde-6.8` | `image: bilelmoussaoui/flatpak-github-actions:kde-6.8` |
233-
| elementary BaseApp | juno | `juno` | `image: bilelmoussaoui/flatpak-github-actions:elementary-juno` |
199+
### Container Images
200+
201+
You can use the generated images by Flathub at <https://github.com/flathub-infra/flatpak-github-actions/pkgs/container/flatpak-github-actions/versions?filters%5Bversion_type%5D=tagged> to avoid re-installing the SDKs for every build.

‎flatpak-builder/tests/app-test/manifest-2.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
id: org.example.MyApp.Devel
44
runtime: org.gnome.Platform
5-
runtime-version: "47"
5+
runtime-version: "48"
66
sdk: org.gnome.Sdk
77
command: test-project
88
finish-args:

‎flatpak-builder/tests/hash.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ const { computeHash } = require('../index')
22

33
test('The manifest hash should be computed properly', async () => {
44
const hash = await computeHash('./tests/manifest-1.yaml')
5-
expect(hash).toBe('199876765acd9df721a52bd7b9e424ee7f4f45e1623c7a4486087bf9a43536b2')
5+
expect(hash).toBe('3cf572c168d382e9b6005b48d082d021e98ff146c1d033a446236dec6353a0d9')
66

77
const hash2 = await computeHash('./tests/manifest-3.json')
8-
expect(hash2).toBe('201c1afd5edd78d766cc9b0b74852e9459a7231bb40dcda0be4a73b1c394d75b')
8+
expect(hash2).toBe('8749e01dcad8f52f51083e213ad0a30e20c9a5a7788b3eb8bebb26b2651193a9')
99
})

‎flatpak-builder/tests/manifest-1.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
app-id: org.example.MyApp.Devel
44
runtime: org.gnome.Platform
5-
runtime-version: "47"
5+
runtime-version: "48"
66
sdk: org.gnome.Sdk
77
command: test-project
88
finish-args:

‎flatpak-builder/tests/manifest-3.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"app-id": "org.gnome.design.Contrast.Devel",
33
"runtime": "org.gnome.Platform",
4-
"runtime-version": "47",
4+
"runtime-version": "48",
55
"sdk": "org.gnome.Sdk",
66
"sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
77
"command": "contrast",

‎flatpak-builder/tests/test-project/org.example.MyApp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
app-id: org.example.MyApp.Devel
44
runtime: org.gnome.Platform
5-
runtime-version: "47"
5+
runtime-version: "48"
66
sdk: org.gnome.Sdk
77
command: test-project
88
finish-args:

0 commit comments

Comments
 (0)