From bdc968d8bbabb66e498c3403d05a591c952fe071 Mon Sep 17 00:00:00 2001 From: gerblesh <101901964+gerblesh@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:46:12 -0700 Subject: [PATCH] fix(ci): update README deps and build.yml --- .github/workflows/build.yml | 26 ++++---------------------- README.md | 6 +++--- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c020d7..63b3ef9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ env: jobs: push-ghcr: name: Build and push image - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: read packages: write @@ -21,12 +21,12 @@ jobs: strategy: fail-fast: false matrix: - major_version: [38, 39] + major_version: [39, 40] include: - - major_version: 38 + - major_version: 39 is_latest_version: true is_stable_version: true - - major_version: 39 + - major_version: 40 is_latest_version: true is_stable_version: false steps: @@ -139,21 +139,3 @@ jobs: if: github.event_name != 'pull_request' run: | echo "${{ toJSON(steps.push.outputs) }}" - - copr-build: - permissions: - contents: read - packages: read - runs-on: ubuntu-latest - container: - image: ghcr.io/akdev1l/copr-build:latest - if: github.event_name != 'pull_request' - steps: - - name: trigger copr build - uses: akdev1l/copr-build@main - id: copr-build - env: - COPR_API_TOKEN_CONFIG: ${{ secrets.UBLUE_COPR_API_TOKEN }} - with: - owner: ublue-os - project-name: staging diff --git a/README.md b/README.md index 13b6ee5..647bcae 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Small update program written in python intended for use in Universal Blue that u Includes systemd timers and services for auto update -dependencies (fedora): ```sudo dnf install python3-psutil libnotify``` +dependencies (fedora): ```sudo dnf install python3-psutil libnotify && pip install topgrade``` # Usage @@ -16,14 +16,14 @@ You can add this to your image by simply pulling down and installing the rpm: ``` COPY --from=ghcr.io/ublue-os/ublue-update:latest /rpms/ublue-update.noarch.rpm /tmp/rpms/ -RUN rpm-ostree install /tmp/rpms/ublue-update.noarch.rpm +RUN pip install topgrade && rpm-ostree install /tmp/rpms/ublue-update.noarch.rpm ``` If you are on an image derived from uBlue main: ``` COPY --from=ghcr.io/ublue-os/ublue-update:latest /rpms/ublue-update.noarch.rpm /tmp/rpms/ -RUN rpm-ostree override remove ublue-os-update-services && rpm-ostree install /tmp/rpms/ublue-update.noarch.rpm +RUN pip install topgrade && rpm-ostree override remove ublue-os-update-services && rpm-ostree install /tmp/rpms/ublue-update.noarch.rpm ``` > **Note**