Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add CI_MANAGE_AUR and update version via GitLab API #10

Open
wants to merge 12 commits into
base: main
Choose a base branch
from

Conversation

dr460nf1r3
Copy link
Member

No description provided.

.ci/manage-aur.sh Outdated Show resolved Hide resolved

# shellcheck source=/dev/null
source .ci/util.shlib
export GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=accept-new"
Copy link
Contributor

@JustTNE JustTNE Jan 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of creating /root/.ssh/id_rsa, it might be better to just use the existing ssh key provided to this repo via DEPLOY_KEY (you will have to add it to the on-commit GitHub action as well) and then using it via ssh -i [keyfile path]

.ci/manage-aur.sh Outdated Show resolved Hide resolved
.ci/on-schedule.sh Outdated Show resolved Hide resolved
.ci/on-schedule.sh Outdated Show resolved Hide resolved
.ci/schedule-packages.sh Outdated Show resolved Hide resolved
.ci/schedule-packages.sh Outdated Show resolved Hide resolved
@@ -15,8 +15,9 @@ variables:
default:
before_script:
- apk add --no-cache --upgrade git bash findutils grep curl jq shfmt rsync diffutils gawk
- git config --global --add safe.directory "*" # fixme?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitLab CI complained about an inconsistent repo state, so this was a quick fix. I couldn't figure out the reason yet.

Comment on lines +37 to +40
image: archlinux:latest
before_script:
- pacman -Syu --noconfirm --needed base-devel git jq pacman-contrib python-pipx python-platformdirs shfmt sudo
- pipx install commitizen
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
image: archlinux:latest
before_script:
- pacman -Syu --noconfirm --needed base-devel git jq pacman-contrib python-pipx python-platformdirs shfmt sudo
- pipx install commitizen
image: alpine:latest

@@ -4,12 +4,17 @@ set -x

# This script is triggered by a scheduled pipeline

# Allow makepkg to work in a non-root environment & unbreak git
chown -R nobody:root "$CI_BUILDS_DIR"
git config --global --add safe.directory "*"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this do?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adjusts directory permissions for makepkg (updpkgsums).. but since you wanted to change this anyways I guess its not required anymore.

- git remote set-url origin $REPO_URL
- git fetch --tags --all --depth 20
- git fetch --tags --force --all --depth 20 # fixme?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably also isn't necessary, it only broke because you had before_script both in global and the individual local namespace

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This refers to a clobbered tag? It couldn't fetch the tag due to this error, I was assuming this to be due to force pushing at the time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants