From 87be0b0dfc14ea85ca0030f5b16bdc82cbd3f581 Mon Sep 17 00:00:00 2001 From: Nemuel Wainaina Date: Wed, 13 Nov 2024 07:23:22 +0300 Subject: [PATCH] Remove unnecessary builds in favor of directly building from source downstream (Flathub) --- .github/workflows/cd.yml | 47 ------------------- .github/workflows/ci.yml | 21 +-------- .gitignore | 2 - Dockerfile | 22 --------- .../io.github.nemuelw.protodesk.metainfo.xml | 2 +- requirements.txt | 1 - 6 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/cd.yml delete mode 100644 Dockerfile diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml deleted file mode 100644 index 1695f94..0000000 --- a/.github/workflows/cd.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Continuous Deployment - -on: - release: - types: [created] - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - arch: [amd64, arm64] - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Build Docker image - run: | - docker build --platform linux/${{ matrix.arch }} -t protodesk . - - - name: Run Docker image - run: | - docker run --name protodesk-container protodesk - - - name: Copy build from container to host - run: | - docker cp protodesk-container:/app/app.dist ./dist - - - name: Create a versioned archive of the build - run: | - tar -czf protodesk-${{ github.event.release.tag_name }}_${{ matrix.arch }}.tar.gz dist/ - - - name: Upload release asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ github.event.release.upload_url}} - asset_path: protodesk-${{ github.event.release.tag_name }}_${{ matrix.arch }}.tar.gz - asset_name: protodesk-${{ github.event.release.tag_name }}_${{ matrix.arch }}.tar.gz - asset_content_type: application/gzip diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c17ff9a..9db9755 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,27 +20,8 @@ jobs: - name: Install dependencies run: | - pip3 install -r requirements.txt + pip3 install flake8 - name: Run flake8 run: | flake8 . - - multiarch-build: - runs-on: ubuntu-latest - strategy: - matrix: - arch: [amd64, arm64] - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Build Docker image - run: | - docker build --platform linux/${{ matrix.arch }} -t protodesk . diff --git a/.gitignore b/.gitignore index 0248268..ca9982c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ .vscode/ .venv/ __pycache__/ -app.build/ -app.dist/ diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 17a1368..0000000 --- a/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# base image -FROM python:3.12-bullseye - -# working directory -WORKDIR /app - -# install required system dependencies -RUN apt-get update && apt-get install -y \ - gcc \ - patchelf - -# copy project files -COPY . /app - -# create and activate a virtual environment -RUN python -m venv .venv && chmod +x .venv/bin/activate && .venv/bin/activate - -# install project dependencies -RUN pip3 install -r requirements.txt - -# build the application with Nuitka -RUN nuitka --enable-plugin=pyside6 --include-data-dir=./assets=./assets --standalone --lto=yes --output-filename=protodesk app.py diff --git a/flathub/io.github.nemuelw.protodesk.metainfo.xml b/flathub/io.github.nemuelw.protodesk.metainfo.xml index 4741fab..a5dedd1 100644 --- a/flathub/io.github.nemuelw.protodesk.metainfo.xml +++ b/flathub/io.github.nemuelw.protodesk.metainfo.xml @@ -8,7 +8,7 @@ GPL-3.0-only Protodesk - io.github.nemuelw.protodesk.png + io.github.nemuelw.protodesk.svg Unofficial desktop app for Proton

diff --git a/requirements.txt b/requirements.txt index 3910434..fb16300 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ flake8==7.1.1 mccabe==0.7.0 -Nuitka==2.4.11 ordered-set==4.1.0 pycodestyle==2.12.1 pyflakes==3.2.0