From a8d16f918c07edee01dab5e6a355ff9ce05bbd64 Mon Sep 17 00:00:00 2001 From: Codex Date: Thu, 9 Apr 2026 12:29:46 +0200 Subject: [PATCH] Fix monero_c Gitea workflow regressions --- .gitea/workflows/build.yml | 2 +- .gitea/workflows/consistency.yml | 25 ------------------- .gitea/workflows/release.yml | 14 ++--------- impls/monero.dart/lib/src/checksum_peya.dart | 2 +- impls/monero.ts/checksum_peya.ts | 2 +- .../src/main/cpp/peya_checksum.h | 2 +- 6 files changed, 6 insertions(+), 41 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 1563e39..1efcf74 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -40,7 +40,7 @@ jobs: target: - name: x86_64 Linux host: x86_64-linux-gnu - packages: automake autotools-dev build-essential ca-certificates ccache clang cmake curl git libssl-dev libtool pkg-config python3 + packages: automake autotools-dev build-essential ca-certificates ccache clang cmake curl git gperf libssl-dev libtool pkg-config python3 - name: Win64 host: x86_64-w64-mingw32 packages: automake autotools-dev build-essential ca-certificates ccache clang cmake curl git libssl-dev libtool pkg-config python3 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 diff --git a/.gitea/workflows/consistency.yml b/.gitea/workflows/consistency.yml index cab2cfc..4babb3e 100644 --- a/.gitea/workflows/consistency.yml +++ b/.gitea/workflows/consistency.yml @@ -45,31 +45,6 @@ jobs: fetch-depth: 1 submodules: false - - name: Configure Gitea auth for private submodules - env: - MONERO_C_GITEA_PAT: ${{ secrets.MONERO_C_GITEA_PAT }} - PEYA_GITEA_PAT: ${{ secrets.PEYA_GITEA_PAT }} - GITEA_PAT: ${{ secrets.GITEA_PAT }} - run: | - set -euo pipefail - - AUTH_TOKEN="${MONERO_C_GITEA_PAT:-${PEYA_GITEA_PAT:-${GITEA_PAT:-}}}" - - if [ -z "${AUTH_TOKEN}" ]; then - echo "Missing Gitea PAT secret for private submodules" - exit 1 - fi - - git config --global url."http://tiamak:${AUTH_TOKEN}@54.38.205.168:3000/".insteadOf "http://54.38.205.168:3000/" - git submodule sync - git -c protocol.version=2 submodule update --init --force monero salvium peya - git -C monero submodule sync --recursive - git -C salvium submodule sync --recursive - git -C peya submodule sync --recursive - git -C monero -c protocol.version=2 submodule update --init --force --recursive - git -C salvium -c protocol.version=2 submodule update --init --force --recursive - git -C peya -c protocol.version=2 submodule update --init --force --recursive - - name: Setup Flutter uses: https://github.com/subosito/flutter-action@v2 with: diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index e19dff2..6335fcc 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -132,7 +132,7 @@ jobs: target: - name: x86_64 Linux host: x86_64-linux-gnu - packages: automake autotools-dev build-essential ca-certificates ccache clang cmake curl git libssl-dev libtool pkg-config python3 + packages: automake autotools-dev build-essential ca-certificates ccache clang cmake curl git gperf libssl-dev libtool pkg-config python3 - name: Win64 host: x86_64-w64-mingw32 packages: automake autotools-dev build-essential ca-certificates ccache clang cmake curl git libssl-dev libtool pkg-config python3 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 @@ -224,17 +224,7 @@ jobs: for asset in "${files[@]}"; do asset_name="$(basename "${asset}")" - existing_id="$(ASSET_NAME="${asset_name}" python3 - <<'PY' -import json, os -name = os.environ["ASSET_NAME"] -with open("/tmp/release-assets.json", "r", encoding="utf-8") as f: - assets = json.load(f) -for item in assets: - if item.get("name") == name: - print(item["id"]) - break -PY -)" + existing_id="$(jq -r --arg name "${asset_name}" '.[] | select(.name == $name) | .id' /tmp/release-assets.json | head -n 1)" if [ -n "${existing_id}" ]; then curl -sS \ diff --git a/impls/monero.dart/lib/src/checksum_peya.dart b/impls/monero.dart/lib/src/checksum_peya.dart index 96661a4..cf54cda 100644 --- a/impls/monero.dart/lib/src/checksum_peya.dart +++ b/impls/monero.dart/lib/src/checksum_peya.dart @@ -1,4 +1,4 @@ // ignore_for_file: constant_identifier_names const String wallet2_api_c_h_sha256 = "5ccccf76d6ce6a38985030ed89ff49c8d688b7920c38b85e6072bad415e5c28f"; -const String wallet2_api_c_cpp_sha256 = "cfbc7bcfb8f8066660a2b19225249d6cc44958272c7816676a32c8ec37fedbda-10d687cab8b3f85d140c3d8cd9eb54b25f029154"; +const String wallet2_api_c_cpp_sha256 = "cfbc7bcfb8f8066660a2b19225249d6cc44958272c7816676a32c8ec37fedbda-fd1126fa7b476ab887502f63dd3ee565da4145a0"; const String wallet2_api_c_exp_sha256 = "31b4f92a01ff4812c46e5978c0195f725fe93c87bcd8036391a12fe9d5774621"; diff --git a/impls/monero.ts/checksum_peya.ts b/impls/monero.ts/checksum_peya.ts index 3dd67f8..275b5e9 100644 --- a/impls/monero.ts/checksum_peya.ts +++ b/impls/monero.ts/checksum_peya.ts @@ -1,5 +1,5 @@ export const peyaChecksum = { wallet2_api_c_h_sha256: "5ccccf76d6ce6a38985030ed89ff49c8d688b7920c38b85e6072bad415e5c28f", - wallet2_api_c_cpp_sha256: "cfbc7bcfb8f8066660a2b19225249d6cc44958272c7816676a32c8ec37fedbda-10d687cab8b3f85d140c3d8cd9eb54b25f029154", + wallet2_api_c_cpp_sha256: "cfbc7bcfb8f8066660a2b19225249d6cc44958272c7816676a32c8ec37fedbda-fd1126fa7b476ab887502f63dd3ee565da4145a0", wallet2_api_c_exp_sha256: "31b4f92a01ff4812c46e5978c0195f725fe93c87bcd8036391a12fe9d5774621", } diff --git a/peya_libwallet2_api_c/src/main/cpp/peya_checksum.h b/peya_libwallet2_api_c/src/main/cpp/peya_checksum.h index 4722a1e..cfd96fd 100644 --- a/peya_libwallet2_api_c/src/main/cpp/peya_checksum.h +++ b/peya_libwallet2_api_c/src/main/cpp/peya_checksum.h @@ -1,6 +1,6 @@ #ifndef MONEROC_CHECKSUMS #define MONEROC_CHECKSUMS const char * PEYA_wallet2_api_c_h_sha256 = "5ccccf76d6ce6a38985030ed89ff49c8d688b7920c38b85e6072bad415e5c28f"; -const char * PEYA_wallet2_api_c_cpp_sha256 = "cfbc7bcfb8f8066660a2b19225249d6cc44958272c7816676a32c8ec37fedbda-10d687cab8b3f85d140c3d8cd9eb54b25f029154"; +const char * PEYA_wallet2_api_c_cpp_sha256 = "cfbc7bcfb8f8066660a2b19225249d6cc44958272c7816676a32c8ec37fedbda-fd1126fa7b476ab887502f63dd3ee565da4145a0"; const char * PEYA_wallet2_api_c_exp_sha256 = "31b4f92a01ff4812c46e5978c0195f725fe93c87bcd8036391a12fe9d5774621"; #endif