Skip to content

Commit

Permalink
XXX debug
Browse files Browse the repository at this point in the history
  • Loading branch information
martinpitt committed Jun 14, 2022
1 parent 927bf8a commit 6ee32fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 130 deletions.
124 changes: 0 additions & 124 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
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 "[email protected]"
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 [email protected]: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 "[email protected]"
- 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://[email protected]/${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
8 changes: 3 additions & 5 deletions packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -74,16 +74,14 @@ 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
trigger: release
metadata:
dist_git_branches:
- fedora-development
- fedora-35
- fedora-36

- job: koji_build
trigger: commit
Expand Down
2 changes: 1 addition & 1 deletion tools/cockpit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 6ee32fc

Please sign in to comment.