Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix a few actions #1583

Merged
merged 4 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions .github/workflows/audit.yml

This file was deleted.

37 changes: 8 additions & 29 deletions .github/workflows/build_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@ jobs:
name: "Build binaries"
runs-on: ${{ matrix.info.os }}
container: ${{ matrix.info.container }}
timeout-minutes: 30
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
info:
# ======= Supported targets =======
# Linux (x86-64, x86, aarch64)
#
# TODO: In the future, when ARM runners are available on github, switch ARM targets off of cross.
- {
os: "ubuntu-20.04",
target: "x86_64-unknown-linux-gnu",
Expand Down Expand Up @@ -228,7 +230,7 @@ jobs:
build-msi:
name: "Build MSI installer"
runs-on: "windows-2019"
timeout-minutes: 30
timeout-minutes: 10
steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down Expand Up @@ -276,34 +278,10 @@ jobs:
name: "release-build-msi"
path: release

# build-vm:
# name: "Build using VMs"
# runs-on: "ubuntu-latest"
# timeout-minutes: 30
# strategy:
# fail-fast: false
# matrix:
# info:
# - {
# type: "freebsd",
# os_release: "14.1",
# target: "x86_64-unknown-freebsd",
# }
# - {
# type: "freebsd",
# os_release: "13.3",
# target: "x86_64-unknown-freebsd",
# }
# steps:
# - name: Checkout repository
# uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# with:
# fetch-depth: 1

build-cirrus:
name: "Build using Cirrus CI"
runs-on: "ubuntu-latest"
timeout-minutes: 30
timeout-minutes: 10
steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down Expand Up @@ -341,10 +319,11 @@ jobs:
build-deb:
name: "Build .deb software packages"
runs-on: "ubuntu-20.04"
timeout-minutes: 30
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
# TODO: In the future, when ARM runners are available on github, switch ARM targets off of cross.
info:
- { target: "x86_64-unknown-linux-gnu", dpkg: amd64 }
- { target: "x86_64-unknown-linux-musl", cross: true, dpkg: amd64 }
Expand Down Expand Up @@ -469,7 +448,7 @@ jobs:
name: "Build .rpm software packages"
runs-on: ubuntu-latest
container: ghcr.io/clementtsang/almalinux-8
timeout-minutes: 30
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ jobs:

# Runs rustfmt + tests + clippy on the main supported platforms.
#
# Note that m1 macOS is tested via CirrusCI.
# TODO: In the future, when ARM runners are available on github, switch ARM targets off of cross.
supported:
needs: pre-job
if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
runs-on: ${{ matrix.info.os }}
timeout-minutes: 18
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
needs: pre-job
runs-on: ${{ matrix.info.os }}
if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
timeout-minutes: 20
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
name: "Test using VMs"
needs: pre-job
runs-on: "ubuntu-latest"
timeout-minutes: 30
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
needs: pre-job
if: ${{ needs.pre-job.outputs.should_skip != 'true' }}
runs-on: ${{ matrix.info.os }}
timeout-minutes: 18
timeout-minutes: 10
strategy:
fail-fast: false
matrix:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ jobs:
steps:
- name: Check if mock
run: |
echo "${{ github.event.inputs.isMock }}";
if [[ -z "${{ github.event.inputs.isMock }}" ]]; then
echo "This is a scheduled nightly run."
elif [[ ${{ github.event.inputs.isMock }} == true ]]; then
elif [[ "${{ github.event.inputs.isMock }}" == true ]]; then
echo "This is a mock run."
else
echo "This is NOT a mock run. Watch for the generated files!"
Expand Down