From 6ee32fcab3c7055b6020fa8c4939c86d47be8eb2 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 13 Jun 2022 14:36:32 +0200 Subject: [PATCH] XXX debug --- .github/workflows/release.yml | 124 ---------------------------------- packit.yaml | 8 +-- tools/cockpit.spec | 2 +- 3 files changed, 4 insertions(+), 130 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c565dc337462..ae4b9e7add9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,127 +40,3 @@ jobs: filename: ${{ steps.publish.outputs.filename }} checksum: ${{ steps.publish.outputs.checksum }} download: ${{ steps.publish.outputs.download }} - - guide: - needs: source - environment: website - permissions: {} - runs-on: ubuntu-latest - container: - image: ghcr.io/cockpit-project/unit-tests - options: --user root - steps: - - name: Checkout website repository - uses: actions/checkout@v3 - with: - path: website - repository: cockpit-project/cockpit-project.github.io - ssh-key: ${{ secrets.DEPLOY_KEY }} - - - name: Download source release - run: curl -L -o '${{ needs.source.outputs.filename }}' '${{ needs.source.outputs.download }}' - - - name: Verify checksum - run: echo '${{ needs.source.outputs.checksum }} ${{ needs.source.outputs.filename }}' | sha256sum -c - - - name: Build guide - run: | - mkdir source build - tar --directory source --extract --strip-components=1 --file '${{ needs.source.outputs.filename }}' - ( - cd build - ../source/configure - make doc/guide/html/index.html - ) - - - name: Update the website - run: | - rm -rf website/guide/latest - mv -Tv build/doc/guide/html website/guide/latest - - # Add frontmatter for Jekyll - find website/guide/latest -name '*.html' -exec sed -i ' - 1i\ - ---\ - layout: guide\ - ---' '{}' ';' - - git config --global user.name "GitHub Workflow" - git config --global user.email "cockpituous@cockpit-project.org" - - cd website - git add guide/ - git commit --message='Update guide to version ${{ github.ref_name }}' - git show --stat - git push origin main - - - flathub: - needs: source - environment: flathub - permissions: {} - runs-on: ubuntu-latest - steps: - - name: Checkout source repository - uses: actions/checkout@v3 - with: - path: src - - - name: Checkout flathub repository - uses: actions/checkout@v3 - with: - path: flathub - repository: flathub/org.cockpit_project.CockpitClient - ssh-key: ${{ secrets.DEPLOY_KEY }} - # this is needed so we can push to a different repository - fetch-depth: 0 - - - name: Update flathub repository - run: | - set -x - - DOWNLOAD='${{ needs.source.outputs.download }}' - CHECKSUM='${{ needs.source.outputs.checksum }}' - - git config --global user.name "GitHub Workflow" - git config --global user.email "cockpituous@cockpit-project.org" - - cd flathub - git checkout -b "${{ github.ref_name }}" - git add "$(../src/containers/flatpak/prepare "${DOWNLOAD}" "${CHECKSUM}")" - git commit -m "Update to version ${{ github.ref_name }}" - git show - git push git@github.com:cockpit-project/org.cockpit_project.CockpitClient HEAD - - - node-cache: - # doesn't depend on it, but let's make sure the build passes before we do this - needs: [source] - runs-on: ubuntu-latest - environment: node-cache - # done via deploy key, token needs no write permissions at all - permissions: {} - steps: - - name: Clone repository - uses: actions/checkout@v3 - - - name: Set up git - run: | - git config user.name "GitHub Workflow" - git config user.email "cockpituous@cockpit-project.org" - - - name: Tag node-cache - run: | - set -eux - # this is a shared repo, prefix with project name - TAG="${GITHUB_REPOSITORY#*/}-$(basename $GITHUB_REF)" - tools/node-modules checkout - cd node_modules - git tag "$TAG" - git remote add cache "ssh://git@github.com/${GITHUB_REPOSITORY%/*}/node-cache" - eval $(ssh-agent) - ssh-add - <<< '${{ secrets.DEPLOY_KEY }}' - # make this idempotent: delete an existing tag - git push cache :"$TAG" || true - git push cache tag "$TAG" - ssh-add -D diff --git a/packit.yaml b/packit.yaml index 33c1e64f7c48..6e07d22c73b0 100644 --- a/packit.yaml +++ b/packit.yaml @@ -53,8 +53,8 @@ jobs: - job: copr_build trigger: release metadata: - owner: "@cockpit" - project: "cockpit-preview" + owner: "martinpitt" + project: "test-fixes" preserve_project: True # HACK: hardcoding this list is redundant and hard to change; packit # should just use the existing config for permanent COPRs; @@ -74,7 +74,7 @@ jobs: # HACK: tarball for releases (copr_build, koji, etc.), copying spec's Source0; this # really should be the default, see https://github.com/packit/packit-service/issues/1505 create-archive: - - sh -exc "curl -L -O https://github.com/cockpit-project/cockpit/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + - sh -exc "curl -L -O https://github.com/martinpitt/cockpit/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" - sh -exc "ls ${PACKIT_PROJECT_NAME_VERSION}.tar.xz" - job: propose_downstream @@ -82,8 +82,6 @@ jobs: metadata: dist_git_branches: - fedora-development - - fedora-35 - - fedora-36 - job: koji_build trigger: commit diff --git a/tools/cockpit.spec b/tools/cockpit.spec index 38abc2d2f4db..59f6b294e299 100644 --- a/tools/cockpit.spec +++ b/tools/cockpit.spec @@ -51,7 +51,7 @@ URL: https://cockpit-project.org/ Version: 0 Release: 1%{?dist} -Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz +Source0: https://github.com/martinpitt/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp})