diff --git a/.github/actions/proof-params-download/action.yml b/.github/actions/proof-params-download/action.yml index 11df8c7ba..eabd1acc9 100644 --- a/.github/actions/proof-params-download/action.yml +++ b/.github/actions/proof-params-download/action.yml @@ -1,7 +1,14 @@ name: Download proof params +inputs: + github-token: + description: 'A secrets.GITHUB_TOKEN' + required: true + runs: using: 'composite' + + #on: workflow_call # workflow_call: # inputs: @@ -25,7 +32,7 @@ runs: with: route: GET /repos/filecoin-project/rust-fil-proofs/actions/workflows/proof-params.yml/runs?per_page=1 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ inputs.github-token }} - name: Download all Artifacts from proof-params workflow uses: actions/download-artifact@v4 with: @@ -34,7 +41,7 @@ runs: path: /var/tmp/filecoin-proof-parameters/ merge-multiple: true run-id: ${{ fromJson(steps.latest-proof-params.outputs.data).workflow_runs[0].id }} - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ inputs.github-token }} - name: Obtain Filecoin IPP parameter file # paramfetch is using `ipget` which currently always times out on # CI, hence get this file via HTTP instead. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4844e3ad..a4fb5995e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,7 +192,8 @@ jobs: - name: Download the proof params uses: ./.github/actions/proof-params-download - #with: + with: + github-token: ${{ secrets.GITHUB_TOKEN }} # parameters-json-hash: ${{ hashFiles('filecoin-proofs/parameters.json') }} - name: Test in release profile diff --git a/.github/workflows/proof-params-download.yml b/.github/workflows/proof-params-download.yml deleted file mode 100644 index e7e7b0173..000000000 --- a/.github/workflows/proof-params-download.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Download proof params - -on: workflow_call - workflow_call: - inputs: - # The hash of the parameters.json file. - parameters-json-hash: - required: true - type: string - #secrets: - # token: - # required: true - -jobs: - download: - runs-on: ubuntu-latest - name: Download proof params - steps: - #- uses: actions/checkout@v4 - - name: Get run-id from latest proof-params workflow run - uses: octokit/request-action@v2.x - id: latest-proof-params - with: - route: GET /repos/filecoin-project/rust-fil-proofs/actions/workflows/proof-params.yml/runs?per_page=1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Download all Artifacts from proof-params workflow - uses: actions/download-artifact@v4 - with: - pattern: proof-params-v28-n-${{ inputs.parameters-json-hash }}-* - path: /var/tmp/filecoin-proof-parameters/ - merge-multiple: true - run-id: ${{ fromJson(steps.latest-proof-params.outputs.data).workflow_runs[0].id }} - github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Obtain Filecoin IPP parameter file - # paramfetch is using `ipget` which currently always times out on - # CI, hence get this file via HTTP instead. - #cargo run --release --bin paramfetch -- -a -j srs-inner-product.json - # `--insecure` is needed due to an outdated base systems. - run: curl --insecure https://proofs.filecoin.io/v28-fil-inner-product-v1.srs --output /var/tmp/filecoin-proof-parameters/ -v28-fil-inner-product-v1.srs - - name: List parameter files - run: ls -al /var/tmp/filecoin-proof-parameters/