Skip to content

Commit 26f4f24

Browse files
committed
ci: fix comparison artifact flow
1 parent c02a77f commit 26f4f24

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/reproducible-release.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ on:
1111
description: Workflow run id that produced the comparison artifact
1212
required: false
1313
default: ''
14-
comparison_repository:
15-
description: Optional owner/repo for the comparison artifact
16-
required: false
17-
default: ''
1814
push:
1915
tags:
2016
- 'v*'
@@ -87,7 +83,7 @@ jobs:
8783
name: ${{ inputs.comparison_artifact_name }}
8884
path: ${{ runner.temp }}/comparison
8985
github-token: ${{ github.token }}
90-
repository: ${{ inputs.comparison_repository || github.repository }}
86+
repository: ${{ github.repository }}
9187
run-id: ${{ inputs.comparison_run_id }}
9288

9389
- name: Install diffoscope
@@ -108,7 +104,9 @@ jobs:
108104
OUTPUT_DIR: ${{ runner.temp }}/reproducible-release
109105
run: |
110106
set -euo pipefail
111-
if [ -d "$RUNNER_TEMP/comparison" ]; then
107+
if [ -d "$RUNNER_TEMP/comparison/extracted-apks" ]; then
108+
export DIFFOSCOPE_COMPARE_DIR="$RUNNER_TEMP/comparison/extracted-apks"
109+
elif [ -d "$RUNNER_TEMP/comparison" ]; then
112110
export DIFFOSCOPE_COMPARE_DIR="$RUNNER_TEMP/comparison"
113111
fi
114112
scripts/reproduce-release.sh

docs/reproducible-builds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ SKIP_GRADLE_BUILD=true AAB_PATH=/path/to/bitkit-mainnet-release-181.aab scripts/
6060

6161
The `Reproducible Release` workflow builds `bundleMainnetRelease`, recreates APK splits with bundletool, extracts the `arm64-v8a` native libraries, and uploads checksums plus reproduction artifacts. Workflow behavior can only be fully verified after merge because GitHub Actions workflow changes are only active for PRs opened after the workflow change is merged.
6262

63-
If a comparison artifact is available in GitHub Actions, pass its artifact name and source workflow run id to the manual workflow inputs. The optional repository input can point at a different `owner/repo` when the artifact is not in the current repository. The workflow installs `diffoscope` and writes `diffoscope.html` and `diffoscope.txt` when possible.
63+
If a comparison artifact from this repository is available in GitHub Actions, pass its artifact name and source workflow run id to the manual workflow inputs. The workflow installs `diffoscope` and writes `diffoscope.html` and `diffoscope.txt` when possible.
6464

6565
## Manual diffoscope checks
6666

0 commit comments

Comments
 (0)