From 19d5a87dc1f3e6fecb7a061439901762d66cc81e Mon Sep 17 00:00:00 2001 From: marksvc Date: Tue, 12 Apr 2022 14:02:39 -0600 Subject: [PATCH 1/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index ae667403e3..96f22640aa 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -23,18 +23,18 @@ name: Build flatpak package on: push: branches: - - develop - - support/* - - release/* - - hotfix/* - - master + - develop + - support/* + - release/* + - hotfix/* + - master pull_request: branches: - - develop - - support/* - - release/* - - hotfix/* - - master + - develop + - support/* + - release/* + - hotfix/* + - master workflow_dispatch: jobs: @@ -115,10 +115,10 @@ jobs: sudo apt-get update sudo apt-get install flatpak-builder sudo flatpak remote-add --if-not-exists flathub \ - https://flathub.org/repo/flathub.flatpakrepo + https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install --noninteractive flathub \ - org.gnome.Platform//3.36 \ - org.gnome.Sdk//3.36 + org.gnome.Platform//3.36 \ + org.gnome.Sdk//3.36 - name: Build flatpak package run: | set -xueo pipefail @@ -127,8 +127,8 @@ jobs: "s/(\s*).*FW-Auto-Head.*/\$1commit: $(git rev-parse HEAD) # FW-Auto-Head: Generated line. See build script./" \ org.sil.FieldWorks.yml flatpak-builder --verbose --user --sandbox --ccache \ - --repo=local-repo --keep-build-dirs --force-clean build-dir \ - org.sil.FieldWorks.yml + --repo=local-repo --keep-build-dirs --force-clean build-dir \ + org.sil.FieldWorks.yml - name: Determine package version run: | set -xueo pipefail @@ -149,9 +149,9 @@ jobs: run: | set -xueo pipefail flatpak --user remote-add --no-gpg-verify --if-not-exists \ - local-repo ./local-repo + local-repo ./local-repo flatpak --user install --or-update --noninteractive local-repo \ - org.sil.FieldWorks org.sil.FieldWorks.Debug + org.sil.FieldWorks org.sil.FieldWorks.Debug base_package_name="fieldworks-${{ env.PACKAGE_VERSION }}" flatpak build-bundle ./local-repo "${base_package_name}.flatpak" org.sil.FieldWorks flatpak build-bundle --runtime ./local-repo "${base_package_name}-Debug.flatpak" org.sil.FieldWorks.Debug From 072d91d2220d2b8e200f125d7a4893a187b86f32 Mon Sep 17 00:00:00 2001 From: marksvc Date: Tue, 12 Apr 2022 14:36:30 -0600 Subject: [PATCH 2/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 96f22640aa..30348f4e01 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -42,6 +42,9 @@ jobs: name: "Flatpak" runs-on: ubuntu-latest timeout-minutes: 180 + env: + FLATPAK_DIR: "${GITHUB_WORKSPACE}/flatpak" + ARTIFACTS_DIR: "${GITHUB_WORKSPACE}/../artifacts" steps: - name: "Check if it's plugged in" run: | @@ -122,6 +125,7 @@ jobs: - name: Build flatpak package run: | set -xueo pipefail + cd "${FLATPAK_DIR}" # Build HEAD commit. perl -pi -e \ "s/(\s*).*FW-Auto-Head.*/\$1commit: $(git rev-parse HEAD) # FW-Auto-Head: Generated line. See build script./" \ @@ -132,6 +136,7 @@ jobs: - name: Determine package version run: | set -xueo pipefail + cd "${FLATPAK_DIR}" cat ./.flatpak-builder/build/fieldworks-1/fw/Src/MasterVersionInfo.txt source ./.flatpak-builder/build/fieldworks-1/fw/Src/MasterVersionInfo.txt # VERSION_SUFFIX will be empty, or set to FWBETAVERSION but with a dash before it. @@ -148,6 +153,7 @@ jobs: - name: Create flatpak bundle run: | set -xueo pipefail + cd "${FLATPAK_DIR}" flatpak --user remote-add --no-gpg-verify --if-not-exists \ local-repo ./local-repo flatpak --user install --or-update --noninteractive local-repo \ @@ -156,19 +162,19 @@ jobs: flatpak build-bundle ./local-repo "${base_package_name}.flatpak" org.sil.FieldWorks flatpak build-bundle --runtime ./local-repo "${base_package_name}-Debug.flatpak" org.sil.FieldWorks.Debug flatpak build-bundle --runtime ./local-repo "${base_package_name}-Locale.flatpak" org.sil.FieldWorks.Locale - mkdir -p artifacts - mv fieldworks-*.flatpak artifacts - ls -al artifacts + mkdir -p "${ARTIFACTS_DIR}" + mv fieldworks-*.flatpak "${ARTIFACTS_DIR}" + ls -al "${ARTIFACTS_DIR}" - name: Save artifacts uses: actions/upload-artifact@v2 with: name: fw-flatpak-bundle path: | - artifacts/ + "${ARTIFACTS_DIR}" - name: Publish artifacts as Github release uses: ncipollo/release-action@v1.8.6 with: - artifacts: "artifacts/*" + artifacts: "${ARTIFACTS_DIR}/*" prerelease: true commit: ${{ github.ref_name }} # New tag name to use From 63f8f41b13454d73e5c2d36518edad90220abc7a Mon Sep 17 00:00:00 2001 From: marksvc Date: Tue, 12 Apr 2022 14:52:31 -0600 Subject: [PATCH 3/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 30348f4e01..88214f57f5 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -43,8 +43,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 180 env: - FLATPAK_DIR: "${GITHUB_WORKSPACE}/flatpak" - ARTIFACTS_DIR: "${GITHUB_WORKSPACE}/../artifacts" + FLATPAK_DIR: "${{env.GITHUB_WORKSPACE}}/flatpak" + ARTIFACTS_DIR: "${{env.GITHUB_WORKSPACE}}/../artifacts" steps: - name: "Check if it's plugged in" run: | From 7df27ecf173cb69e8dc8870796ed7a24b4ee54ac Mon Sep 17 00:00:00 2001 From: marksvc Date: Tue, 12 Apr 2022 14:54:08 -0600 Subject: [PATCH 4/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 88214f57f5..66c1345a9e 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -43,8 +43,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 180 env: - FLATPAK_DIR: "${{env.GITHUB_WORKSPACE}}/flatpak" - ARTIFACTS_DIR: "${{env.GITHUB_WORKSPACE}}/../artifacts" + FLATPAK_DIR: "${{github.workspace}}/flatpak" + ARTIFACTS_DIR: "${{github.workspace}}/../artifacts" steps: - name: "Check if it's plugged in" run: | From 89618df71a3ed01d0319c430f5affb16675b9764 Mon Sep 17 00:00:00 2001 From: marksvc Date: Wed, 13 Apr 2022 13:45:23 -0600 Subject: [PATCH 5/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index 66c1345a9e..b39930e864 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -124,8 +124,10 @@ jobs: org.gnome.Sdk//3.36 - name: Build flatpak package run: | - set -xueo pipefail + set -xueo pipefail cd "${FLATPAK_DIR}" + perl -pi -e 's/v9.0.17-14-g37c0f8f/v9.1.9-beta-2-g5e94970/' org.sil.FieldWorks.yml + perl -pi -e 's/08586f7479d5c99d668d4ec92a1824e02f2982683abf3d13549e07dc1378eaf1204547a1ce6cf9a29f4a9ee418aeaf558e00a13e25e9bd41a0de880a20de1f39/84e809b7452e6b16d9a44c21080da4ef5a7eb6d6613f2702bb131400ddf0197446cc2382c51147fd423838de7fed71797fbe05b1b4e4e0d5a2819e3c16916f9f/' org.sil.FieldWorks.yml # Build HEAD commit. perl -pi -e \ "s/(\s*).*FW-Auto-Head.*/\$1commit: $(git rev-parse HEAD) # FW-Auto-Head: Generated line. See build script./" \ From ec09629b420f9159948bb2336bfa122b7adc85d0 Mon Sep 17 00:00:00 2001 From: marksvc Date: Wed, 13 Apr 2022 16:20:56 -0600 Subject: [PATCH 6/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index b39930e864..fdf9cc356f 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -167,22 +167,22 @@ jobs: mkdir -p "${ARTIFACTS_DIR}" mv fieldworks-*.flatpak "${ARTIFACTS_DIR}" ls -al "${ARTIFACTS_DIR}" - - name: Save artifacts - uses: actions/upload-artifact@v2 - with: - name: fw-flatpak-bundle - path: | - "${ARTIFACTS_DIR}" - - name: Publish artifacts as Github release - uses: ncipollo/release-action@v1.8.6 - with: - artifacts: "${ARTIFACTS_DIR}/*" - prerelease: true - commit: ${{ github.ref_name }} - # New tag name to use - tag: "${{ env.TAG_NAME }}" - allowUpdates: true - artifactErrorsFailBuild: true - name: "v${{ env.PACKAGE_VERSION }}" - body: "Automatically generated FieldWorks flatpak package for internal testing. Not for use on production machines or with real data." - token: ${{ secrets.GITHUB_TOKEN }} + #- name: Save artifacts + # uses: actions/upload-artifact@v2 + # with: + # name: fw-flatpak-bundle + # path: | + # "${ARTIFACTS_DIR}" + #- name: Publish artifacts as Github release + # uses: ncipollo/release-action@v1.8.6 + # with: + # artifacts: "${{env.ARTIFACTS_DIR}}/*" + # prerelease: true + # commit: ${{ github.sha }} + # # New tag name to use + # tag: "${{ env.TAG_NAME }}" + # allowUpdates: true + # artifactErrorsFailBuild: true + # name: "v${{ env.PACKAGE_VERSION }}" + # body: "Automatically generated FieldWorks flatpak package for internal testing. Not for use on production machines or with real data." + # token: ${{ secrets.GITHUB_TOKEN }} From 7056dfe1b3445beef3d97b3b62f6d87ed66e7dab Mon Sep 17 00:00:00 2001 From: marksvc Date: Wed, 13 Apr 2022 16:21:24 -0600 Subject: [PATCH 7/7] Update flatpak.yml --- .github/workflows/flatpak.yml | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index fdf9cc356f..2e2778d3df 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -167,22 +167,22 @@ jobs: mkdir -p "${ARTIFACTS_DIR}" mv fieldworks-*.flatpak "${ARTIFACTS_DIR}" ls -al "${ARTIFACTS_DIR}" - #- name: Save artifacts - # uses: actions/upload-artifact@v2 - # with: - # name: fw-flatpak-bundle - # path: | - # "${ARTIFACTS_DIR}" - #- name: Publish artifacts as Github release - # uses: ncipollo/release-action@v1.8.6 - # with: - # artifacts: "${{env.ARTIFACTS_DIR}}/*" - # prerelease: true - # commit: ${{ github.sha }} - # # New tag name to use - # tag: "${{ env.TAG_NAME }}" - # allowUpdates: true - # artifactErrorsFailBuild: true - # name: "v${{ env.PACKAGE_VERSION }}" - # body: "Automatically generated FieldWorks flatpak package for internal testing. Not for use on production machines or with real data." - # token: ${{ secrets.GITHUB_TOKEN }} + - name: Save artifacts + uses: actions/upload-artifact@v2 + with: + name: fw-flatpak-bundle + path: | + "${ARTIFACTS_DIR}" + - name: Publish artifacts as Github release + uses: ncipollo/release-action@v1.8.6 + with: + artifacts: "${{env.ARTIFACTS_DIR}}/*" + prerelease: true + commit: ${{ github.sha }} + # New tag name to use + tag: "${{ env.TAG_NAME }}" + allowUpdates: true + artifactErrorsFailBuild: true + name: "v${{ env.PACKAGE_VERSION }}" + body: "Automatically generated FieldWorks flatpak package for internal testing. Not for use on production machines or with real data." + token: ${{ secrets.GITHUB_TOKEN }}