From 54f3a4493e925552abb04df6c6694a7656a1b3b3 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 2 Apr 2023 02:35:24 +0200 Subject: [PATCH] Stop using deprecated runtime --- .github/workflows/flatpak-test.yml | 6 +++--- README.md | 6 +++--- flatpak-builder/tests/app-test/manifest-2.yaml | 2 +- flatpak-builder/tests/hash.test.js | 4 ++-- flatpak-builder/tests/manifest-1.yaml | 2 +- flatpak-builder/tests/manifest-3.json | 2 +- flatpak-builder/tests/test-project/org.example.MyApp.yaml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/flatpak-test.yml b/.github/workflows/flatpak-test.yml index b7a7c725..ac67124c 100644 --- a/.github/workflows/flatpak-test.yml +++ b/.github/workflows/flatpak-test.yml @@ -9,7 +9,7 @@ jobs: name: Flatpak Builder runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-44 options: --privileged strategy: fail-fast: false @@ -54,7 +54,7 @@ jobs: name: Flatpak Builder Stop At runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-44 options: --privileged steps: - uses: actions/checkout@v3 @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest needs: flatpak-builder container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-44 options: --privileged steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 4ebf1ef9..ebf093b5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ jobs: name: "Flatpak" runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-44 options: --privileged steps: - uses: actions/checkout@v2 @@ -72,7 +72,7 @@ jobs: name: "Flatpak" runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-44 options: --privileged strategy: matrix: @@ -155,7 +155,7 @@ jobs: name: "Flatpak" runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-40 + image: bilelmoussaoui/flatpak-github-actions:gnome-44 options: --privileged steps: - uses: actions/checkout@v2 diff --git a/flatpak-builder/tests/app-test/manifest-2.yaml b/flatpak-builder/tests/app-test/manifest-2.yaml index 168316b3..0f80038a 100644 --- a/flatpak-builder/tests/app-test/manifest-2.yaml +++ b/flatpak-builder/tests/app-test/manifest-2.yaml @@ -2,7 +2,7 @@ --- id: org.example.MyApp.Devel runtime: org.gnome.Platform -runtime-version: "40" +runtime-version: "44" sdk: org.gnome.Sdk command: test-project finish-args: diff --git a/flatpak-builder/tests/hash.test.js b/flatpak-builder/tests/hash.test.js index b20a75bb..8d591d22 100644 --- a/flatpak-builder/tests/hash.test.js +++ b/flatpak-builder/tests/hash.test.js @@ -2,8 +2,8 @@ const { computeHash } = require('../index') test('The manifest hash should be computed properly', async () => { const hash = await computeHash('./tests/manifest-1.yaml') - expect(hash).toBe('29ed9085544904a2bca91a82c487b5d33961650f488743473f801ccde9279ae7') + expect(hash).toBe('8c43f78c9f33c1f379521211c9b9e91fe051cef3f638e4427026beb27261a587') const hash2 = await computeHash('./tests/manifest-3.json') - expect(hash2).toBe('f75c438a29d4f04b7b53801a653e485fbdb773a284d9f53ae29087e927b2bdfe') + expect(hash2).toBe('fb531a4e4d3227ff9cdb37b8d1b9830878aa63542a066c2bd157dd94c7dda1ba') }) diff --git a/flatpak-builder/tests/manifest-1.yaml b/flatpak-builder/tests/manifest-1.yaml index 9262c494..2b264359 100644 --- a/flatpak-builder/tests/manifest-1.yaml +++ b/flatpak-builder/tests/manifest-1.yaml @@ -2,7 +2,7 @@ --- app-id: org.example.MyApp.Devel runtime: org.gnome.Platform -runtime-version: "40" +runtime-version: "44" sdk: org.gnome.Sdk command: test-project finish-args: diff --git a/flatpak-builder/tests/manifest-3.json b/flatpak-builder/tests/manifest-3.json index 6815d382..ae0770bc 100644 --- a/flatpak-builder/tests/manifest-3.json +++ b/flatpak-builder/tests/manifest-3.json @@ -1,7 +1,7 @@ { "app-id": "org.gnome.design.Contrast.Devel", "runtime": "org.gnome.Platform", - "runtime-version": "40", + "runtime-version": "44", "sdk": "org.gnome.Sdk", "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"], "command": "contrast", diff --git a/flatpak-builder/tests/test-project/org.example.MyApp.yaml b/flatpak-builder/tests/test-project/org.example.MyApp.yaml index 42d68d8c..03fe7eff 100644 --- a/flatpak-builder/tests/test-project/org.example.MyApp.yaml +++ b/flatpak-builder/tests/test-project/org.example.MyApp.yaml @@ -2,7 +2,7 @@ --- app-id: org.example.MyApp.Devel runtime: org.gnome.Platform -runtime-version: "40" +runtime-version: "44" sdk: org.gnome.Sdk command: test-project finish-args: