From 40529bec6914112c8fb5e0222061f10cb108fd00 Mon Sep 17 00:00:00 2001 From: Boldi Date: Wed, 4 Oct 2023 10:36:02 +0100 Subject: [PATCH 1/5] Working on proper deployment --- .github/workflows/deploy.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b3ab4796..2b79fed4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,8 +2,8 @@ name: deploy on: push: - tags: - - '*' +# tags: +# - '*' env: SRC_DIR: zxlive @@ -12,7 +12,8 @@ jobs: build_and_deploy: strategy: matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] +# os: [ ubuntu-latest, windows-latest, macos-latest ] + os: [ macos-latest ] python-version: [ 3.11 ] runs-on: ${{ matrix.os }} steps: @@ -23,10 +24,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install base package run: pip install cx_freeze - - name: Deploy - run: | - python deploy.py build - - name: Publish - run: | - ls build - echo "TODO: publish build/zxlive and the related files" \ No newline at end of file + - name: Build MacOS + if: matrix.os == 'macos-latest' + run: python deploy.py bdist_dmg + - name: Upload build + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.os }} + path: build/ \ No newline at end of file From ef64462fd5977c94ffd7da1f49362bfb21d2b89f Mon Sep 17 00:00:00 2001 From: Boldi Date: Wed, 4 Oct 2023 10:59:50 +0100 Subject: [PATCH 2/5] Working on proper deployment --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2b79fed4..ee6386ab 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: # os: [ ubuntu-latest, windows-latest, macos-latest ] - os: [ macos-latest ] + os: [ macos-latest-large ] python-version: [ 3.11 ] runs-on: ${{ matrix.os }} steps: @@ -25,10 +25,10 @@ jobs: - name: Install base package run: pip install cx_freeze - name: Build MacOS - if: matrix.os == 'macos-latest' + if: matrix.os == 'macos-latest-large' run: python deploy.py bdist_dmg - name: Upload build uses: actions/upload-artifact@v3 with: name: ${{ matrix.os }} - path: build/ \ No newline at end of file + path: build/*.dmg \ No newline at end of file From 0022b52d6aa10b459c85e85602d1785858e8bbd7 Mon Sep 17 00:00:00 2001 From: Boldi Date: Wed, 4 Oct 2023 11:03:52 +0100 Subject: [PATCH 3/5] Working on proper deployment --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ee6386ab..2ae31259 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: # os: [ ubuntu-latest, windows-latest, macos-latest ] - os: [ macos-latest-large ] + os: [ ubuntu-latest ] python-version: [ 3.11 ] runs-on: ${{ matrix.os }} steps: @@ -25,10 +25,10 @@ jobs: - name: Install base package run: pip install cx_freeze - name: Build MacOS - if: matrix.os == 'macos-latest-large' - run: python deploy.py bdist_dmg + if: matrix.os == 'ubuntu-latest' + run: python deploy.py bdist_rpm - name: Upload build uses: actions/upload-artifact@v3 with: name: ${{ matrix.os }} - path: build/*.dmg \ No newline at end of file + path: build/*.rpm \ No newline at end of file From b994b7ef0da98b7f22f386e2ca6089e83d51dd49 Mon Sep 17 00:00:00 2001 From: Boldi Date: Wed, 4 Oct 2023 11:06:36 +0100 Subject: [PATCH 4/5] Working on proper deployment --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2ae31259..2fa70259 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,9 +26,9 @@ jobs: run: pip install cx_freeze - name: Build MacOS if: matrix.os == 'ubuntu-latest' - run: python deploy.py bdist_rpm + run: python deploy.py bdist - name: Upload build uses: actions/upload-artifact@v3 with: name: ${{ matrix.os }} - path: build/*.rpm \ No newline at end of file + path: build/* \ No newline at end of file From f105728ca2d6a39eaa0638662755f3330590c89b Mon Sep 17 00:00:00 2001 From: Boldi Date: Wed, 4 Oct 2023 14:01:49 +0100 Subject: [PATCH 5/5] Working on proper deployment --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2fa70259..83322479 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,7 +26,7 @@ jobs: run: pip install cx_freeze - name: Build MacOS if: matrix.os == 'ubuntu-latest' - run: python deploy.py bdist + run: python deploy.py build - name: Upload build uses: actions/upload-artifact@v3 with: