@@ -73,15 +73,16 @@ jobs:
7373 cmake \
7474 flatpak
7575
76- sudo su $(whoami) -c "flatpak --user remote-add --if-not-exists flathub \
77- https://flathub.org/repo/flathub.flatpakrepo"
76+ sudo su "$(whoami)" -c "flatpak --user remote-add --if-not-exists flathub \
77+ https://flathub.org/repo/flathub.flatpakrepo
78+ "
7879
79- sudo su $(whoami) -c "flatpak --user install -y flathub \
80+ sudo su " $(whoami)" -c "flatpak --user install -y flathub \
8081 org.flatpak.Builder \
8182 org.freedesktop.Platform/${{ matrix.arch }}/${PLATFORM_VERSION} \
8283 org.freedesktop.Sdk/${{ matrix.arch }}/${PLATFORM_VERSION} \
8384 org.freedesktop.Sdk.Extension.node${NODE_VERSION}/${{ matrix.arch }}/${PLATFORM_VERSION} \
84- "
85+ "
8586
8687 flatpak run org.flatpak.Builder --version
8788
@@ -101,9 +102,11 @@ jobs:
101102 flatpak-${{ matrix.arch }}-
102103
103104 - name : Configure Flatpak Manifest
105+ env :
106+ BRANCH : ${{ github.head_ref }}
104107 run : |
105108 # variables for manifest
106- branch="${{ github.head_ref }}"
109+ branch="${{ env.BRANCH }}"
107110 build_version=${{ inputs.release_version }}
108111 commit=${{ inputs.release_commit }}
109112
@@ -137,35 +140,37 @@ jobs:
137140
138141 - name : Debug Manifest
139142 working-directory : build
140- run : cat ${APP_ID}.yml
143+ run : cat " ${APP_ID}.yml"
141144
142145 - name : Build Linux Flatpak
143146 working-directory : build
144147 run : |
145- sudo su $(whoami) -c "flatpak run org.flatpak.Builder \
148+ echo "::add-matcher::.github/matchers/gcc-strip3.json"
149+ sudo su "$(whoami)" -c "flatpak run org.flatpak.Builder \
146150 --arch=${{ matrix.arch }} \
147151 --force-clean \
148152 --repo=repo \
149153 --sandbox \
150154 --stop-at=cuda build-sunshine ${APP_ID}.yml"
151155 cp -r .flatpak-builder copy-of-flatpak-builder
152- sudo su $(whoami) -c "flatpak run org.flatpak.Builder \
156+ sudo su " $(whoami)" -c "flatpak run org.flatpak.Builder \
153157 --arch=${{ matrix.arch }} \
154158 --force-clean \
155159 --repo=repo \
156160 --sandbox \
157161 build-sunshine ${APP_ID}.yml"
158162 rm -rf .flatpak-builder
159163 mv copy-of-flatpak-builder .flatpak-builder
160- sudo su $(whoami) -c "flatpak build-bundle \
164+ sudo su " $(whoami)" -c "flatpak build-bundle \
161165 --arch=${{ matrix.arch }} \
162166 ./repo \
163167 ../artifacts/sunshine_${{ matrix.arch }}.flatpak ${APP_ID}"
164- sudo su $(whoami) -c "flatpak build-bundle \
168+ sudo su " $(whoami)" -c "flatpak build-bundle \
165169 --runtime \
166170 --arch=${{ matrix.arch }} \
167171 ./repo \
168172 ../artifacts/sunshine_debug_${{ matrix.arch }}.flatpak ${APP_ID}.Debug"
173+ echo "::remove-matcher owner=gcc-strip3::"
169174
170175 - name : Lint Flatpak
171176 working-directory : build
@@ -177,7 +182,7 @@ jobs:
177182 --exceptions \
178183 --user-exceptions "${exceptions_file}" \
179184 manifest \
180- ${APP_ID}.yml
185+ " ${APP_ID}.yml"
181186
182187 echo "Linting flatpak repo"
183188 # TODO: add arg
@@ -193,13 +198,13 @@ jobs:
193198 if : matrix.arch == 'x86_64'
194199 run : |
195200 mkdir -p flathub/modules
196- cp ./build/generated-sources.json ./flathub/
197- cp ./build/package-lock.json ./flathub/
198- cp ./build/${APP_ID}.yml ./flathub/
199- cp ./build/${APP_ID}.metainfo.xml ./flathub/
200- cp ./packaging/linux/flatpak/README.md ./flathub/
201- cp ./packaging/linux/flatpak/flathub.json ./flathub/
202- cp -r ./packaging/linux/flatpak/modules/. ./flathub/modules/
201+ cp " ./build/generated-sources.json" " ./flathub/"
202+ cp " ./build/package-lock.json" " ./flathub/"
203+ cp " ./build/${APP_ID}.yml" " ./flathub/"
204+ cp " ./build/${APP_ID}.metainfo.xml" " ./flathub/"
205+ cp " ./packaging/linux/flatpak/README.md" " ./flathub/"
206+ cp " ./packaging/linux/flatpak/flathub.json" " ./flathub/"
207+ cp -r " ./packaging/linux/flatpak/modules/." " ./flathub/modules/"
203208 # submodules will need to be handled in the workflow that creates the PR
204209
205210 # create the archive
0 commit comments