From 20d31caf6531fcfb414fe093f8a5cc7de45ec841 Mon Sep 17 00:00:00 2001 From: cyan Date: Mon, 1 Jul 2024 09:18:11 +0000 Subject: [PATCH] drop cache entirely --- .github/workflows/pr-comment.yaml | 2 +- .github/workflows/xmruw.yaml | 5 ----- download_artifact.sh | 28 --------------------------- save_artifact.sh | 32 ------------------------------- 4 files changed, 1 insertion(+), 66 deletions(-) delete mode 100755 download_artifact.sh delete mode 100755 save_artifact.sh diff --git a/.github/workflows/pr-comment.yaml b/.github/workflows/pr-comment.yaml index 130b0fb..d7a703f 100644 --- a/.github/workflows/pr-comment.yaml +++ b/.github/workflows/pr-comment.yaml @@ -5,10 +5,10 @@ on: types: [completed] jobs: pr_comment: - if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' runs-on: ubuntu-latest steps: - uses: actions/github-script@v6 + continue-on-error: true with: # This snippet is public-domain, taken from # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml diff --git a/.github/workflows/xmruw.yaml b/.github/workflows/xmruw.yaml index d07c56a..bb86211 100644 --- a/.github/workflows/xmruw.yaml +++ b/.github/workflows/xmruw.yaml @@ -22,11 +22,6 @@ jobs: git config --global user.email "ci@mrcyjanek.net" git config --global user.name "CI mrcyjanek.net" ./apply_patches.sh ${{ matrix.coin }} - - uses: actions/cache@v4 - with: - path: | - ${{ matrix.coin }} - key: aarch64-linux-android-${{ matrix.coin }}-${{ runner.os }}-${{ hashFiles('patches/${{ matrix.coin }}/*.patch') }} - name: ${{ matrix.coin }}/aarch64-linux-android run: ./build_single.sh ${{ matrix.coin }} aarch64-linux-android -j$(nproc) - name: clone xmruw diff --git a/download_artifact.sh b/download_artifact.sh deleted file mode 100755 index cdf5241..0000000 --- a/download_artifact.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# Usage: ${{ github.workspace }}/download_artifact.sh libsodium "${SODIUM_VERSION}-${{ matrix.host_triplet }}-${SODIUM_HASH}" ${{ github.workspace }}/prefix/lib/libsodium.a -set -e -registry_user=mrcyjanek -cache_name="$1" -cache_key="$2" -path_to_file="$3.xz" -basename="$(basename $path_to_file)" - -curl "https://git.mrcyjanek.net/api/packages/mrcyjanek/generic/monero_c/${cache_name}-${cache_key}/${basename}" > /tmp/cache -if [[ "xpackage does not exist" == "x$(head -1 /tmp/cache 2>/dev/null)" ]]; -then - echo "Cache miss '$1' '$2' '$basename'" - rm /tmp/cache - exit 0 -else - echo "Cache hit '$1' '$2' '$basename'" -fi - -mkdir -p $path_to_file -rm -rf $path_to_file -mv /tmp/cache $path_to_file -unxz $path_to_file || rm $path_to_file - -if [[ -f "$3" ]]; -then - touch /tmp/cache_hit_$(echo "$3" | md5sum | awk '{ print $1 }') -fi \ No newline at end of file diff --git a/save_artifact.sh b/save_artifact.sh deleted file mode 100755 index dd8dc45..0000000 --- a/save_artifact.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Usage: ${{ github.workspace }}/save_artifact.sh libsodium "${SODIUM_VERSION}-${{ matrix.host_triplet }}-${SODIUM_HASH}" ${{ github.workspace }}/prefix/lib/libsodium.a - -registry_user=mrcyjanek -cache_name="$1" -cache_key="$2" -path_to_file_="$3" - -if [[ -f "/tmp/cache_hit_$(echo "$3" | md5sum | awk '{ print $1 }')" ]]; -then - echo "was cached $1 $2 $(basename $path_to_file_)" - exit 0 -fi - -path_to_file="$3.xz" -basename="$(basename $path_to_file)" - -if [[ ! -f "$path_to_file_" ]]; -then - echo "$(basename $path_to_file_) doesn't exist" - exit 0; -fi - -xz --extreme --keep $path_to_file_ - -curl --user $registry_user:$PAT_SECRET_PACKAGE \ - --upload-file "$path_to_file" \ - "https://git.mrcyjanek.net/api/packages/mrcyjanek/generic/monero_c/${cache_name}-${cache_key}/${basename}" &>/dev/null - -echo "cached $1 $2 $(basename $path_to_file_)" - -rm $path_to_file \ No newline at end of file