From b5568b2ffad58334788797c305c1961c3f46cbc4 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Mon, 11 Apr 2022 21:28:00 +0900 Subject: [PATCH] I have to remember to enable the auto save in code once creating a new VM --- .github/workflows/cooker.yml | 34 +---------------------- .github/workflows/main.yml | 52 +++++++++++++++++++++++++++++------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 4d27c088..065d6e4f 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -6,19 +6,13 @@ name: Cooker on: # Triggers the workflow on push or pull request events but only for the main branch push: -<<<<<<< HEAD branches: - cooker pull_request: branches: - cooker -======= - branches: [ '*' ] - pull_request: - branches: [ '*' ] ->>>>>>> main - # Allows you to run this workflow manually from the Actions tab +# Allows you to run this workflow manually from the Actions tab workflow_dispatch: # A workflow run is made up of one or more jobs that can run sequentially or in parallel @@ -35,7 +29,6 @@ jobs: - name: Prepearing enviornment run: | -<<<<<<< HEAD git submodule init git submodule update sudo add-apt-repository ppa:alexlarsson/flatpak @@ -43,11 +36,6 @@ jobs: sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 -======= - sudo apt install flatpak flatpak-builder - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 ->>>>>>> main # Runs a set of commands using the runners shell - name: Building flatpak @@ -56,7 +44,6 @@ jobs: sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck -<<<<<<< HEAD - name: Get date for artifacts id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" @@ -65,31 +52,12 @@ jobs: uses: ncipollo/release-action@v1 with: tag: "${{ steps.date.outputs.date }}" -======= - - name: Publish the flatpak in a new cooker release - uses: ncipollo/release-action@v1 - with: - tag: "${{ steps.version.outputs.version }}" ->>>>>>> main body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. -<<<<<<< HEAD Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. -======= - Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues on this build and instead post in the `#pre-release-feedback` section of discord. - - See the [wiki](https://amberelec.org/Contributing-to-AmberELEC) for more info. - - ### Changes (since last prerelease version): - ${{ github.event.client_payload.release_notes }} - - ### Upgrade Instructions - You can update to this release using the `prerelease` channel on your device. This is the recommended way to use prerelease versions. - ->>>>>>> main artifacts: "RetroDECK.flatpak" allowUpdates: true diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fbac637f..35c42c97 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,14 +1,16 @@ -# This is a basic workflow to help you get started with Actions +# Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged -name: main +name: Main # Controls when the workflow will run on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ main ] - pull_request: - branches: [ main ] + branches: + - main + pull_request: + branches: + - main # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -16,7 +18,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - build: + build_cooker_snap: # The type of runner that the job will run on runs-on: ubuntu-latest @@ -25,10 +27,42 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - # Runs a set of commands using the runners shell - - name: Build flatpak + - name: Prepearing enviornment + run: | + git submodule init + git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder p7zip-full + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 + + # Runs a set of commands using the runners shell + - name: Building flatpak run: | - sudo ./build-flatpak.sh sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + + - name: Publish the flatpak in a new cooker release + uses: ncipollo/release-action@v1 + with: + tag: "${{ steps.date.outputs.date }}" + body: | + # Release Notes + + Changelog: + - + - + - + + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: true + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK \ No newline at end of file