build: Use Fedora as base image

pojntfx · Aug 25, 2023 · bb32583 · bb32583
1 parent 705b3ca
commit bb32583
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/hydrun.yaml b/.github/workflows/hydrun.yaml
@@ -17,7 +17,7 @@ jobs:
         target:
           - id: flatpak
             src: .
-            os: golang:bullseye
+            os: fedora:38
             flags: ""
             cmd: ./Hydrunfile flatpak
             dst: out/*

diff --git a/Hydrunfile b/Hydrunfile
@@ -21,6 +21,7 @@ EOT
     gpg --output /tmp/repo.asc --armor --export
 
     # Install dependencies
+    dnf install -y flatpak-builder
     flatpak remote-add --if-not-exists 'flathub' 'https://flathub.org/repo/flathub.flatpakrepo'
     flatpak install -y 'flathub' "org.gnome.Platform//44" "org.gnome.Sdk//44" "org.freedesktop.Sdk.Extension.golang//21.08"
 

diff --git a/com.pojtinger.felicitas.vintangle.yaml b/com.pojtinger.felicitas.vintangle.yaml
@@ -19,8 +19,7 @@ modules:
     buildsystem: simple
     build-commands:
       - git config --global --add safe.directory '*'
-      - GOPROXY='https://proxy.golang.org,direct' sh -c '. /usr/lib/sdk/golang/enable.sh && go generate ./...'
-      - . /usr/lib/sdk/golang/enable.sh && export GOPROXY='https://proxy.golang.org,direct' && go build -o out/com.pojtinger.felicitas.vintangle .
+      - . /usr/lib/sdk/golang/enable.sh && export GOPROXY='https://proxy.golang.org,direct' && go generate ./... && go build -o out/com.pojtinger.felicitas.vintangle .
       - install -D out/com.pojtinger.felicitas.vintangle /app/bin/com.pojtinger.felicitas.vintangle
       - desktop-file-install --dir=/app/share/applications com.pojtinger.felicitas.vintangle.desktop
       - appstream-util validate-relax com.pojtinger.felicitas.vintangle.metainfo.xml