Skip to content

Commit

Permalink
Merge pull request #1 from jmarrero/fix-ci-fedora-40
Browse files Browse the repository at this point in the history
f40: more fixes
  • Loading branch information
lukewarmtemp authored May 2, 2024
2 parents f40f24c + 842c26e commit 85d75f9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/app/rpmostree-clientlib.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ rpmostree_print_gpg_info (GVariant *signatures, gboolean verbose, guint max_key_
{
/* +2 for initial leading spaces */
const guint gpgpad = max_key_len + 2 + strlen (": ");
char *gpgspaces = new char[gpgpad + 1];
g_autofree char *gpgspaces = (char *)g_malloc (gpgpad + 1);
memset (gpgspaces, ' ', gpgpad);
gpgspaces[gpgpad] = '\0';

Expand Down
4 changes: 2 additions & 2 deletions tests/compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail

# freeze on a specific commit for tests for reproducibility and since it should
# always work to target older treefiles
FEDORA_COREOS_CONFIG_COMMIT=ce65013fcb9f10bfee1c7c1c27477c6c6ce676b3
FEDORA_COREOS_CONFIG_COMMIT=83f419c54bad614d70149830cc3b25fe4b93433e

dn=$(cd "$(dirname "$0")" && pwd)
topsrcdir=$(cd "$dn/.." && pwd)
Expand Down Expand Up @@ -49,7 +49,7 @@ if [ ! -d compose-cache ]; then
# default; we'll want it to test `install-langs`. This also means that we have
# to add updates-archive to the repo list.
# Also neuter OSTree layers; we don't re-implement cosa's auto-layering sugar
curl -LO https://src.fedoraproject.org/rpms/fedora-repos/raw/f37/f/fedora-updates-archive.repo
curl -LO https://src.fedoraproject.org/rpms/fedora-repos/raw/f40/f/fedora-updates-archive.repo
python3 -c '
import sys, json
y = json.load(sys.stdin)
Expand Down

0 comments on commit 85d75f9

Please sign in to comment.