Skip to content

Commit

Permalink
Merge pull request #292 from artichoke/dependabot/github_actions/gha-…
Browse files Browse the repository at this point in the history
…deps-16221030a2

Bump the gha-deps group with 3 updates
  • Loading branch information
lopopolo authored Feb 4, 2025
2 parents 494bedc + 37ef16e commit 694b405
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
echo "commit=${release_commit}" >> $GITHUB_OUTPUT
- name: Generate THIRDPARTY license listing
uses: artichoke/generate_third_party@v1.14.0
uses: artichoke/generate_third_party@v1.15.0
with:
artichoke_ref: ${{ steps.release_info.outputs.commit }}
target_triple: ${{ matrix.target }}
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
--format github
- name: Install Rust toolchain
uses: artichoke/setup-rust/build-and-test@v1.12.1
uses: artichoke/setup-rust/build-and-test@v2.0.1
with:
toolchain: ${{ steps.rust_toolchain.outputs.version }}
target: ${{ matrix.target }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repo-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v4.2.2

- name: Sync GitHub Issue Labels
uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c # v5.1.0
uses: crazy-max/ghaction-github-labeler@31674a3852a9074f2086abcf1c53839d466a47e7 # v5.2.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
yaml-file: .github/labels.yaml
Expand Down
5 changes: 4 additions & 1 deletion artichoke_nightly/macos_sign_and_notarize.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ def run_notarytool(command: list[str]) -> str:
# inspect stderr for known 500s and retry with exponential backoff.
#
# See: https://github.com/artichoke/nightly/issues/129
if "Error: HTTP status code: 500. Internal Server Error" in proc.stderr:
if (
"Error: HTTP status code: 500. Internal Server Error" in proc.stderr
or "The request timed out" in proc.stderr
):
raise NotaryToolInternalServerError(proc.stderr)

raise NotaryToolError(proc.stderr)
Expand Down

0 comments on commit 694b405

Please sign in to comment.