Skip to content

Commit

Permalink
feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
gknopf-aranya committed Dec 10, 2024
1 parent 5feb2a8 commit 564b7c5
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 129 deletions.
39 changes: 0 additions & 39 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,8 @@
name: "Setup build tools"
description: "Action for setting up build tools"
inputs:
go-version:
description: "Go version"
required: true
default: "stable"
target:
description: "OS-arch target being compiled for (e.g., linux-arm64)"
runs:
using: "composite"
steps:
# There is a bug in the version of GCC that ships with our
# arm64 runners that prevents BoringSSL from compiling. So,
# use Clang instead.
#
# TODO(eric): Reassess whether we still need these.
- name: Install arm64/amd64 system dependencies
run: |
set -x
lsb_release -a
sudo apt-get update -y
sudo apt-get install -y --no-install-recommends \
build-essential \
clang-14 \
clang-tools-14 \
cmake \
libc++-14-dev \
libc++abi-14-dev \
libclang-14-dev \
libclang1-14 \
llvm-14 \
llvm-14-dev \
lld-14 \
ninja-build \
pkg-config
echo "CC=$(which clang-14)" >> $GITHUB_ENV
echo "CXX=$(which clang-14)" >> $GITHUB_ENV
echo "LD=$(which lld-14)" >> $GITHUB_ENV
shell: bash

#
# Set up Rust
#
Expand Down
46 changes: 0 additions & 46 deletions .github/workflows/build-vxworks.yml

This file was deleted.

7 changes: 3 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ jobs:
build-release:
strategy:
matrix:
runner: [
"ubuntu-latest",
"ubuntu2404-arm64-4core",
]
runner:
- ubuntu-latest
- ubuntu2404-arm64-4core
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v4
Expand Down
25 changes: 5 additions & 20 deletions .github/workflows/correctness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ concurrency:

jobs:
fmt:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand All @@ -39,10 +36,7 @@ jobs:
run: cargo make check-fmt

canaries:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand All @@ -52,10 +46,7 @@ jobs:
run: cargo make check-canaries

clippy:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand All @@ -65,10 +56,7 @@ jobs:
run: cargo make clippy

machete:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand All @@ -78,10 +66,7 @@ jobs:
run: cargo make machete

check:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ concurrency:

jobs:
doc:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ on:

jobs:
release:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- name: Create Release
id: release
Expand All @@ -46,10 +43,7 @@ jobs:
needs:
- release
- build
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- name: Download doc artifacts
uses: actions/download-artifact@v4
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ concurrency:

jobs:
security-checks:
strategy:
matrix:
runner: ["ubuntu-latest"]
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ jobs:
unit-tests:
strategy:
matrix:
runner: [
"ubuntu-latest",
"ubuntu2404-arm64-4core",
]
runner:
- ubuntu-latest
- ubuntu2404-arm64-4core
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v4
Expand Down

0 comments on commit 564b7c5

Please sign in to comment.