Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
0042834736 authored Jan 19, 2024
2 parents e715155 + d8d1b77 commit 18f1cf1
Show file tree
Hide file tree
Showing 77 changed files with 534 additions and 508 deletions.
5 changes: 2 additions & 3 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
self-hosted-runner:
# Labels of self-hosted runner in array of string
labels:
- small
- large
- large-cd
- mcf-dev-large-x64
- mcf-dev-small-x64
2 changes: 1 addition & 1 deletion .github/workflows/android-bindings-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
build_publish:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
container: gcr.io/mobilenode-211420/android-bindings-builder:1_4

steps:
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:

jobs:
build-dev:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

steps:
Expand All @@ -40,7 +40,7 @@ jobs:
uses: ./.github/actions/check-dirty-git

build-prod:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

steps:
Expand All @@ -59,7 +59,7 @@ jobs:
uses: ./.github/actions/check-dirty-git

build-and-test-wasm:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

steps:
Expand All @@ -76,7 +76,7 @@ jobs:
run: wasm-pack test --node wasm-test

lint-rust:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

steps:
Expand All @@ -93,7 +93,7 @@ jobs:


build-and-test-go:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

steps:
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
uses: ./.github/actions/check-dirty-git

docs:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

steps:
Expand All @@ -145,7 +145,7 @@ jobs:
uses: ./.github/actions/check-dirty-git

mc-tests:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

strategy:
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:


consensus-tests:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

strategy:
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:


fog-tests:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

strategy:
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:


fog-ingest-tests:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

services:
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:


fog-conformance-tests:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

services:
Expand Down Expand Up @@ -364,7 +364,7 @@ jobs:
# This test has more than one purpose, due to the time it takes to generate
# sample keys and sample ledger
minting-and-burning-tests:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

services:
Expand Down Expand Up @@ -511,7 +511,7 @@ jobs:
uses: ./.github/actions/check-dirty-git

publish-test-results:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
if: success() || failure()
needs:
- mc-tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependent-repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:

jobs:
android-bindings:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

permissions:
Expand All @@ -31,7 +31,7 @@ jobs:
buildCmd: cargo build

full-service:
runs-on: [self-hosted, Linux, large]
runs-on: mcf-dev-large-x64
container: mobilecoin/builder-install:v0.0.32

permissions:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/mobilecoin-dev-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
generate-metadata:
if: ${{ ! startsWith(github.head_ref, 'dependabot/') }}
name: 👾 Environment Info 👾
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
outputs:
namespace: ${{ steps.meta.outputs.namespace }}
tag: ${{ steps.meta.outputs.tag }}
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
build-rust-hardware-projects:
needs:
- generate-metadata
runs-on: [self-hosted, Linux, large-cd]
runs-on: mcf-dev-large-x64
container:
image: mobilecoin/rust-sgx-base:v0.0.32

Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
path: rust_build_artifacts/

build-go-projects:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- generate-metadata
container:
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
# Create/Refresh base runtime image
########################################
docker-base:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- generate-metadata
steps:
Expand All @@ -247,7 +247,7 @@ jobs:
id: docker_meta
uses: docker/metadata-action@v5
with:
images: ${{ env.DOCKER_ORG }}/runtime-base
images: ${{ env.DOCKER_ORG }}/dcap-runtime-base
flavor: |
latest=true
tags: |
Expand All @@ -269,7 +269,7 @@ jobs:
build-args: |
REPO_ORG=${{ env.DOCKER_ORG }}
context: .
file: .internal-ci/docker/Dockerfile.runtime-base
file: .internal-ci/docker/Dockerfile.dcap-runtime-base
labels: ${{ steps.docker_meta.outputs.labels }}
push: true
tags: ${{ steps.docker_meta.outputs.tags }}
Expand All @@ -278,7 +278,7 @@ jobs:
# Build/Publish public artifacts
#########################################
docker:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- build-go-projects
- build-rust-hardware-projects
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
tags: ${{ steps.docker_meta.outputs.tags }}

charts:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- docker
- generate-metadata
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:

mobilecoin-cd-complete:
# Dummy step for a standard GHA Check that won't change when we update the tests.
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- test-current-bv3-release
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobilecoin-dev-delete.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: delete
jobs:
metadata:
if: startsWith(github.event.ref, 'feature/')
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
outputs:
namespace: ${{ steps.meta.outputs.namespace }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobilecoin-dispatch-dev-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ on:
jobs:
list-values:
name: 👾 Environment Info - ${{ inputs.namespace }} - ${{ inputs.version }} 👾
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mobilecoin-dispatch-dev-mainnet-fog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ env:

jobs:
setup:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Create namespace
uses: mobilecoinofficial/gha-k8s-toolbox@v1
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }}

restore-db-from-archive:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- setup
container:
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
fog-ingest-deploy:
needs:
- restore-db-from-archive
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Deploy fog-ingest
uses: mobilecoinofficial/[email protected]
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
fog-services-deploy:
needs:
- fog-ingest-deploy
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Generate fog-services values file
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mobilecoin-dispatch-dev-testnet-fog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ env:

jobs:
setup:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Create namespace
uses: mobilecoinofficial/gha-k8s-toolbox@v1
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }}

restore-db-from-archive:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- setup
container:
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
fog-ingest-deploy:
needs:
- restore-db-from-archive
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Deploy fog-ingest
uses: mobilecoinofficial/[email protected]
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
fog-services-deploy:
needs:
- fog-ingest-deploy
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
steps:
- name: Generate fog-services values file
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobilecoin-dispatch-mainnet-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
list-values:
runs-on: [self-hosted, small, Linux]
runs-on: mcf-dev-small-x64
steps:
- name: values
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobilecoin-dispatch-testnet-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
list-values:
runs-on: [self-hosted, small, Linux]
runs-on: mcf-dev-small-x64
steps:
- name: values
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mobilecoin-workflow-dev-bootstrap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
secrets: inherit

restore-s3-archive:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- reset
container:
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
# We now have a db with setup-environment
# Note this only works if we are in the same cluster as the dev env.
restore-db-from-archive:
runs-on: [self-hosted, Linux, small]
runs-on: mcf-dev-small-x64
needs:
- setup-environment
container:
Expand Down
Loading

0 comments on commit 18f1cf1

Please sign in to comment.