Skip to content

Commit

Permalink
build: use single sbt project on the top level (#490)
Browse files Browse the repository at this point in the history
Build system changes to use single sbt project on the top level instead of multiple independent ones to simplify and speed up development.

Single build.sbt on the top of the repository
All internal SBT projects removed for each BB
CI adjusted accordingly to test and release from the top level

---------

Co-authored-by: Anton Baliasnikov <anton.baliasnikov@iohk.io>
Co-authored-by: Benjamin Voiturier <benjamin.voiturier@iohk.io>
Co-authored-by: Pat Losoponkul <pat.losoponkul@iohk.io>
  • Loading branch information
4 people committed Apr 4, 2023
1 parent b271ac0 commit 421b5d1
Show file tree
Hide file tree
Showing 116 changed files with 9,069 additions and 3,060 deletions.
5 changes: 1 addition & 4 deletions .github/.scala-steward.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
buildRoots = [ "mercury/mercury-mediator",
"iris/service", "iris/client/scala-client", "castor/lib",
"shared", "pollux/lib", "prism-agent/service", "connect/lib",
"prism-node/client/scala-client" ]
buildRoots = [ "." ]

pullRequests.grouping = [
{ name = "all", title = "build: scala-steward dependency updates", "filter" = [{"group" = "*"}] }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 17 additions & 6 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
repo:
- "*"
apollo:
- apollo/**/*
castor:
- castor/**/*
mercury:
- mercury/**/*
pluto:
- pluto/**/*
connect:
- connect/**/*
pollux:
- pollux/**/*
iris:
- iris/**/*
prism-agent:
- prism-agent/**/*
prism-node:
- prism-node/**/*
shared:
- shared/**/*
infra:
- infrastructure/**/*
build:
- project/**/*
- build.sbt
- version.sbt
- package*.json
ci:
- .github/**/*
docs:
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ on:
schedule:
- cron: "0 3 * * *"
pull_request:
paths:
- ".github/workflows/e2e-tests.yml"
- "infrastructure/shared/docker-compose.yml"
- "tests/e2e-tests/**"
- "prism-agent/service/**"
push:
branches:
- "main"
Expand Down Expand Up @@ -62,8 +57,8 @@ jobs:

- name: Build local version of PRISM Agent
env:
ENV_FILE: "../../infrastructure/local/.env"
PRISM_AGENT_PATH: "../../prism-agent/service/"
ENV_FILE: "infrastructure/local/.env"
PRISM_AGENT_PATH: "../.."
GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:

jobs:
triage:
runs-on: ubuntu-latest
runs-on: self-hosted
steps:
- uses: actions/labeler@v4
with:
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,20 @@ on:
jobs:
lint:
name: Lint changes
runs-on: ubuntu-latest
env:
APPLY_FIXES: none
GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
runs-on: self-hosted
container:
image: ghcr.io/input-output-hk/atala-qa-automation
volumes:
- /nix:/nix
credentials:
username: ${{ secrets.ATALA_GITHUB_ACTOR }}
password: ${{ secrets.ATALA_GITHUB_TOKEN }}
env:
GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
APPLY_FIXES: none
steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{ secrets.ATALA_GITHUB_TOKEN }}
fetch-depth: 0
Expand All @@ -28,7 +35,7 @@ jobs:
uses: megalinter/megalinter@v6
- name: Archive production artifacts
if: success() || failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Mega-Linter reports
path: |
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/prism-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Atala PRISM unit tests

# Cancel previously running workflows if new commit pushed to the branch
# this will help to push fixes earlier and stop previous workflows
concurrency:
group: ${{ github.head_ref }}${{ github.ref }}-atala-prism
cancel-in-progress: true

on:
push:
branches:
- "main"
pull_request:

jobs:
build-and-test-atala-prism:
uses: ./.github/workflows/unit-tests-common.yml
with:
component-name: "Atala PRISM"
component-dir: "."
secrets: inherit
11 changes: 1 addition & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,12 @@ concurrency:
on:
workflow_call:
inputs:
release-component:
required: true
type: string
release-branch:
required: false
type: string
default: "main"
workflow_dispatch:
inputs:
release-component:
description: "Release component"
required: true
default: "mercury/mercury-library"
release-branch:
description: "Branch to release from"
required: false
Expand All @@ -30,7 +23,6 @@ jobs:
GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
PUBLISH_PACKAGES: "enable" # To enable the packager plugin on Mercury
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -65,6 +57,5 @@ jobs:
GIT_AUTHOR_NAME: ${{ steps.import_gpg.outputs.name }}
GIT_COMMITTER_NAME: ${{ steps.import_gpg.outputs.name }}
run: |
cd ${{ inputs.release-component }}
npm install
npx semantic-release -e semantic-release-monorepo
npx semantic-release
File renamed without changes.
File renamed without changes.

0 comments on commit 421b5d1

Please sign in to comment.