diff --git a/.github/actions_scripts/analyse_git_reference.py b/.github/actions_scripts/analyse_git_reference.py index 13aaca4d67..be34fefae2 100755 --- a/.github/actions_scripts/analyse_git_reference.py +++ b/.github/actions_scripts/analyse_git_reference.py @@ -121,4 +121,3 @@ def set_github_variable(varname, varval): set_github_variable("JAMULUS_VERSION", release_version_name) set_github_variable("RELEASE_VERSION_NAME", release_version_name) set_github_variable("X_GITHUB_WORKSPACE", os.environ['GITHUB_WORKSPACE']) -set_github_variable("BUILD_FLATPACK", str(False).lower()) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d1397d0670..808621dd1f 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -46,7 +46,6 @@ jobs: version: ${{ steps.jamulus-build-vars.outputs.JAMULUS_VERSION }} version_name: ${{ steps.jamulus-build-vars.outputs.RELEASE_VERSION_NAME }} x_github_workspace: ${{ steps.jamulus-build-vars.outputs.X_GITHUB_WORKSPACE }} #needed, because matrix can not directly access ${{ github.workspace }} aparrently - build_flatpack: ${{ steps.jamulus-build-vars.outputs.BUILD_FLATPACK }} steps: @@ -238,53 +237,3 @@ jobs: if: matrix.config.uses_codeql uses: github/codeql-action/analyze@v1 - - ## Builds a Linux flatpack ## - flatpak-builder: - name: "Build Flatpak (artifact)" - if: ${{ contains(needs.create_release.outputs.build_flatpack, 'true') }} - runs-on: ubuntu-20.04 - needs: [create_release] - container: - image: docker.io/bilelmoussaoui/flatpak-github-actions - options: --privileged - steps: - - uses: actions/checkout@v2 - - id: flatpak-prepare - name: Change branch name in manifest - run: python3 io.jamulus.Jamulus.prepare.py $GITHUB_SHA - working-directory: ./distributions/ - env: - jamulus_project_path: ${{ github.workspace }} - jamulus_buildversionstring: ${{ needs.create_release.outputs.version_name }} - - uses: bilelmoussaoui/flatpak-github-actions@v2 - with: - bundle: "${{ steps.flatpak-prepare.outputs.flatpak_bundle }}" - manifest-path: "distributions/io.jamulus.Jamulus.json" - - # download artifact - - id: flatpak-download - uses: actions/download-artifact@v2 - with: - name: ${{ steps.flatpak-prepare.outputs.flatpak_name }} - path: ~/${{ steps.flatpak-prepare.outputs.flatpak_name }} - - - name: echo download-path - run: "echo ${{steps.flatpak-download.outputs.download-path}}" - - name: ls download-path - run: "ls ${{steps.flatpak-download.outputs.download-path}}" - - name: ls githome ~ - run: "ls ~/" - - # Upload Artifact to Release - - name: Upload Flatpack - if: ${{ contains(needs.create_release.outputs.publish_to_release, 'true') }} - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create_release.outputs.upload_url }} # See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ${{steps.flatpak-download.outputs.download-path}}/${{ steps.flatpak-prepare.outputs.flatpak_bundle }} - asset_name: ${{ steps.flatpak-prepare.outputs.flatpak_name }} - asset_content_type: application/octet-stream