diff --git a/.github/workflows/001-tester-ubuntu-make-test-auraed.yml b/.github/workflows/001-tester-ubuntu-make-test-auraed.yml index 6704e0043..fc9502632 100644 --- a/.github/workflows/001-tester-ubuntu-make-test-auraed.yml +++ b/.github/workflows/001-tester-ubuntu-make-test-auraed.yml @@ -1,6 +1,4 @@ # ---------------------------------------------------------------------------- # -# # -# +--------------------------------------------+ # # | █████╗ ██╗ ██╗██████╗ █████╗ ███████╗ | # # | ██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ | # # | ███████║██║ ██║██████╔╝███████║█████╗ | # @@ -10,12 +8,9 @@ # +--------------------------------------------+ # # # # Distributed Systems Runtime # -# # # ---------------------------------------------------------------------------- # -# # -# Copyright 2022 - 2024, the Aurae contributors # -# SPDX-License-Identifier: Apache-2.0 # -# # +# Copyright 2022 - 2024, the aurae contributors # +# SPDX-License-Identifier: Apache-2.0 # # ---------------------------------------------------------------------------- # # # This is the premerge test workflow for auraed @@ -63,7 +58,7 @@ jobs: with: toolchain: stable components: clippy, rustfmt - - name: Cargo build, lint, test [make test] + - name: Auraed test [make os-deps auraed-test] # This should remain the only command we execute as this matches the title of the file. # The goal is for this to be easy to find from the GitHub dashboard. # Instead of adding more commands here, consider another make target or a new YAML file diff --git a/.github/workflows/002-tester-ubuntu-make-test-auraescript.yml b/.github/workflows/002-tester-ubuntu-make-test-auraescript.yml index ca22a2afe..dc86cd9b3 100644 --- a/.github/workflows/002-tester-ubuntu-make-test-auraescript.yml +++ b/.github/workflows/002-tester-ubuntu-make-test-auraescript.yml @@ -1,6 +1,4 @@ # ---------------------------------------------------------------------------- # -# # -# +--------------------------------------------+ # # | █████╗ ██╗ ██╗██████╗ █████╗ ███████╗ | # # | ██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ | # # | ███████║██║ ██║██████╔╝███████║█████╗ | # @@ -10,12 +8,9 @@ # +--------------------------------------------+ # # # # Distributed Systems Runtime # -# # # ---------------------------------------------------------------------------- # -# # -# Copyright 2022 - 2024, the Aurae contributors # -# SPDX-License-Identifier: Apache-2.0 # -# # +# Copyright 2022 - 2024, the aurae contributors # +# SPDX-License-Identifier: Apache-2.0 # # ---------------------------------------------------------------------------- # # # This is the premerge test workflow for auraescript @@ -30,7 +25,7 @@ # # When this build passes we should have a "clean cargo" output! # -name: "Tester (002) [ubuntu:latest] [auraescript]" +name: "(002) [ubuntu:latest] make auraescript-test" on: push: branches: main @@ -58,38 +53,9 @@ jobs: key: 000-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: | 000-${{ runner.os }}-cargo- - - name: Install protoc-gen-doc in [ubuntu:latest] - run: | - wget https://github.com/pseudomuto/protoc-gen-doc/releases/download/v1.5.1/protoc-gen-doc_1.5.1_linux_amd64.tar.gz - tar -xzf protoc-gen-doc_1.5.1_linux_amd64.tar.gz - chmod +x protoc-gen-doc - cp protoc-gen-doc /usr/local/bin/protoc-gen-doc - sudo apt-get update - sudo apt-get install -y protobuf-compiler - - name: Install compile time dependencies (musl-tools) in [ubuntu:latest] - # - # Do not add GNU libraries here! Do not add GNU libraries here! - # - # Please (seriously please) be careful about adding commands here. - # This is our core way of validating that our binary is "healthy" - # If we need to install anything with the word "lib" in it to get - # the build to pass, we likely should be having other discussions - # instead of adding commands here. - # - # Do not add GNU libraries here! Do not add GNU libraries here! - # - # For example, we should NOT be adding libraries such as "libseccomp" - # or "libdbus". - # - # If in doubt, please ask in Discord in the build channel. - # - # Do not at GNU libraries here! Do not add GNU libraries here! - run: | - sudo apt-get update - sudo apt-get install -y musl-tools - - name: Cargo build, lint, test [make test] + - name: Auraescript test [make os-deps auraescript-test] # This should remain the only command we execute as this matches the title of the file. # The goal is for this to be easy to find from the GitHub dashboard. # Instead of adding more commands here, consider another make target or a new YAML file # named with a good name. - run: make auraescript-test + run: make os-deps auraescript-test diff --git a/.github/workflows/003-tester-ubuntu-make-test-aer.yml b/.github/workflows/003-tester-ubuntu-make-test-aer.yml index a7fb4ea24..f0037306a 100644 --- a/.github/workflows/003-tester-ubuntu-make-test-aer.yml +++ b/.github/workflows/003-tester-ubuntu-make-test-aer.yml @@ -1,6 +1,4 @@ # ---------------------------------------------------------------------------- # -# # -# +--------------------------------------------+ # # | █████╗ ██╗ ██╗██████╗ █████╗ ███████╗ | # # | ██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ | # # | ███████║██║ ██║██████╔╝███████║█████╗ | # @@ -10,12 +8,9 @@ # +--------------------------------------------+ # # # # Distributed Systems Runtime # -# # # ---------------------------------------------------------------------------- # -# # -# Copyright 2022 - 2024, the Aurae contributors # -# SPDX-License-Identifier: Apache-2.0 # -# # +# Copyright 2022 - 2024, the aurae contributors # +# SPDX-License-Identifier: Apache-2.0 # # ---------------------------------------------------------------------------- # # # This is the premerge test workflow for aer @@ -30,7 +25,7 @@ # # When this build passes we should have a "clean cargo" output! # -name: "Tester (003) [ubuntu:latest] [aer]" +name: "(003) [ubuntu:latest] make aer-test" on: push: branches: main @@ -58,38 +53,9 @@ jobs: key: 000-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: | 000-${{ runner.os }}-cargo- - - name: Install protoc-gen-doc in [ubuntu:latest] - run: | - wget https://github.com/pseudomuto/protoc-gen-doc/releases/download/v1.5.1/protoc-gen-doc_1.5.1_linux_amd64.tar.gz - tar -xzf protoc-gen-doc_1.5.1_linux_amd64.tar.gz - chmod +x protoc-gen-doc - cp protoc-gen-doc /usr/local/bin/protoc-gen-doc - sudo apt-get update - sudo apt-get install -y protobuf-compiler - - name: Install compile time dependencies (musl-tools) in [ubuntu:latest] - # - # Do not add GNU libraries here! Do not add GNU libraries here! - # - # Please (seriously please) be careful about adding commands here. - # This is our core way of validating that our binary is "healthy" - # If we need to install anything with the word "lib" in it to get - # the build to pass, we likely should be having other discussions - # instead of adding commands here. - # - # Do not add GNU libraries here! Do not add GNU libraries here! - # - # For example, we should NOT be adding libraries such as "libseccomp" - # or "libdbus". - # - # If in doubt, please ask in Discord in the build channel. - # - # Do not at GNU libraries here! Do not add GNU libraries here! - run: | - sudo apt-get update - sudo apt-get install -y musl-tools - - name: Cargo build, lint, test [make test] + - name: aer test [make os-deps aer-test] # This should remain the only command we execute as this matches the title of the file. # The goal is for this to be easy to find from the GitHub dashboard. # Instead of adding more commands here, consider another make target or a new YAML file # named with a good name. - run: make aer-test + run: make os-deps aer-test diff --git a/Makefile b/Makefile index c9b767a2f..48a0ffd67 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ # ---------------------------------------------------------------------------- # -# Apache 2.0 License Copyright © 2022-2023 The Aurae Authors # -# # -# +--------------------------------------------+ # # | █████╗ ██╗ ██╗██████╗ █████╗ ███████╗ | # # | ██╔══██╗██║ ██║██╔══██╗██╔══██╗██╔════╝ | # # | ███████║██║ ██║██████╔╝███████║█████╗ | # @@ -11,21 +8,9 @@ # +--------------------------------------------+ # # # # Distributed Systems Runtime # -# # # ---------------------------------------------------------------------------- # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -# # +# Copyright 2022 - 2024, the aurae contributors # +# SPDX-License-Identifier: Apache-2.0 # # ---------------------------------------------------------------------------- # # Variables and Settings branch ?= main