From 9ef052bb69e72bed8d73f60f866cfa68dfc371c7 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 23 Feb 2022 07:48:03 +0100 Subject: [PATCH] updated build workflow I removed the nightly builds now, as the alpha builds are much more structured --- .github/workflows/build-project-linux.yml | 42 ---------------- .github/workflows/build-project-mac.yml | 35 ------------- .github/workflows/build-project-win.yml | 61 +---------------------- 3 files changed, 1 insertion(+), 137 deletions(-) diff --git a/.github/workflows/build-project-linux.yml b/.github/workflows/build-project-linux.yml index e4a29d0a..f2e934ae 100644 --- a/.github/workflows/build-project-linux.yml +++ b/.github/workflows/build-project-linux.yml @@ -122,45 +122,3 @@ jobs: # release the app after building release: ${{ startsWith(github.ref, 'refs/tags/v') }} - - name: LIST ALL FILES - shell: bash - run: | - ls -R - - - name: chmod +x - shell: bash - run: | - chmod +x ./gui/dist/*.AppImage - - - - name: Create app bundle - shell: bash - run: | - mkdir gui-bundle - cp ./gui/dist/*.AppImage gui-bundle - cp -R ./tnc/dist/tnc gui-bundle - chmod +x ./gui-bundle/tnc/tnc - chmod +x ./gui-bundle/tnc/daemon - cd ./gui-bundle - zip -r FreeDATA_linux.zip . - ls -R - - - name: Upload Ubuntu GUI Bundle artifacts - uses: actions/upload-artifact@v2 - with: - name: gui-bundle-ubuntu-artifact - path: ./gui-bundle/FreeDATA_linux.zip - - - name: Release - uses: WebFreak001/deploy-nightly@v1.1.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: https://uploads.github.com/repos/DJ2LS/FreeDATA/releases/48616289/assets{?name,label} # find out this value by opening https://api.github.com/repos///releases in your browser and copy the full "upload_url" value including the {?name,label} part - release_id: 48616289 # same as above (id can just be taken out the upload_url, it's used to find old releases) - asset_path: ./gui-bundle/FreeDATA_linux.zip # path to archive to upload - asset_name: FreeDATA_linux-nightly-$$.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash - asset_content_type: application/zip # required by GitHub API - max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted - - diff --git a/.github/workflows/build-project-mac.yml b/.github/workflows/build-project-mac.yml index ec510122..fae16950 100644 --- a/.github/workflows/build-project-mac.yml +++ b/.github/workflows/build-project-mac.yml @@ -111,38 +111,3 @@ jobs: # release the app after building release: ${{ startsWith(github.ref, 'refs/tags/v') }} - - name: LIST ALL FILES - shell: bash - run: | - ls -R - - - name: Create app bundle - shell: bash - run: | - mkdir gui-bundle - cp ./gui/dist/FreeDATA*.dmg gui-bundle - cd ./gui-bundle - zip -r FreeDATA_mac.zip . - - - name: Upload macOS GUI Bundle artifacts - uses: actions/upload-artifact@v2 - with: - name: gui-bundle-ubuntu-artifact - path: ./gui-bundle/FreeDATA_mac.zip - - - - - - name: Release - uses: WebFreak001/deploy-nightly@v1.1.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: https://uploads.github.com/repos/DJ2LS/FreeDATA/releases/48616289/assets{?name,label} # find out this value by opening https://api.github.com/repos///releases in your browser and copy the full "upload_url" value including the {?name,label} part - release_id: 48616289 # same as above (id can just be taken out the upload_url, it's used to find old releases) - asset_path: ./gui-bundle/FreeDATA_mac.zip # path to archive to upload - asset_name: FreeDATA_mac-nightly-$$.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash - asset_content_type: application/zip # required by GitHub API - max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted - - diff --git a/.github/workflows/build-project-win.yml b/.github/workflows/build-project-win.yml index da2da451..cead86eb 100644 --- a/.github/workflows/build-project-win.yml +++ b/.github/workflows/build-project-win.yml @@ -72,7 +72,7 @@ jobs: type: 'zip' filename: 'FreeDATA_windows.zip' directory: ./tnc/dist/tnc - path: ./tnc/dist/tnc + path: . #exclusions: '*.git* /*node_modules/* .editorconfig' - name: LIST ALL FILES @@ -110,62 +110,3 @@ jobs: # release the app after building release: ${{ startsWith(github.ref, 'refs/tags/v') }} - - name: LIST ALL FILES - shell: bash - run: | - ls -R - - - - name: Create app bundle - shell: bash - run: | - mkdir gui-bundle - cp -R ./gui/dist/win-unpacked/ gui-bundle - cp -R ./tnc/dist/tnc gui-bundle/win-unpacked - - - name: LIST ALL FILES - shell: bash - run: | - ls -R - - - - name: Archive Release - uses: thedoctor0/zip-release@master - with: - type: 'zip' - filename: 'FreeDATA_windows.zip' - directory: ./gui-bundle/win-unpacked/ - path: . - #exclusions: '*.git* /*node_modules/* .editorconfig' - - - name: Release TNC - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/v') - with: - files: ./tnc/dist/compressed/${{ matrix.zip_name }}.zip - - - - - name: Upload Windows GUI Bundle artifacts - uses: actions/upload-artifact@v2 - with: - name: gui-bundle-windows-artifact - path: ./gui-bundle/win-unpacked/FreeDATA_windows.zip - - - name: LIST ALL FILES - shell: bash - run: | - ls -R - - - name: Release - uses: WebFreak001/deploy-nightly@v1.1.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: https://uploads.github.com/repos/DJ2LS/FreeDATA/releases/48616289/assets{?name,label} # find out this value by opening https://api.github.com/repos///releases in your browser and copy the full "upload_url" value including the {?name,label} part - release_id: 48616289 # same as above (id can just be taken out the upload_url, it's used to find old releases) - asset_path: ./gui-bundle/win-unpacked/FreeDATA_windows.zip # path to archive to upload - asset_name: FreeDATA_windows-nightly-$$.zip # name to upload the release as, use $$ to insert date (YYYYMMDD) and 6 letter commit hash - asset_content_type: application/zip # required by GitHub API - max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted -