Skip to content

Commit c5ff364

Browse files
dimyjeannotdimyjeannot
authored
feat: OECO cleanup 30 (#62)
* feat: collapsing GO SDK for easier imports * chore(release): publish - project: oeco-sdk-v2beta 0.11.0 * chore(release): publish - project: oeco-sdk-v2beta 0.12.0 * feat: collapsing GO SDK for easier imports * chore(release): publish - project: go/oeco-sdk/v2beta 0.13.0 * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports * feat: collapsing GO SDK for easier imports --------- Co-authored-by: Dimy Jeannot <>
1 parent 475f075 commit c5ff364

File tree

18 files changed

+119
-55
lines changed

18 files changed

+119
-55
lines changed

‎.github/workflows/_build.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,23 @@ jobs:
9696
uses: nrwl/nx-set-shas@v4
9797

9898
- name: Run NX
99-
run: pnpm exec nx affected -t lint build --exclude="apps-clients-public-cli-v2alpha-oeco" --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
99+
#run: pnpm exec nx affected -t lint build --exclude="apps-clients-public-cli-v2alpha-oeco" --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
100+
run: pnpm exec nx affected -t build --exclude='*,!tag:type:sdk' --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
100101
env:
101102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102103
GORELEASER_KEY: ${{ secrets.goreleaser_key }}
103104

104-
- name: Merge coverage reports
105-
run: |
106-
mkdir -p ./coverage
107-
find ./coverage -name "coverage.txt" -exec cat {} + > ./coverage/coverage.txt
108-
109-
- name: Upload results to Codecov
110-
uses: codecov/codecov-action@v5
111-
with:
112-
token: ${{ secrets.codecov_token }}
113-
slug: openecosystems/ecosystem
114-
files: "./coverage/coverage.txt"
105+
# - name: Merge coverage reports
106+
# run: |
107+
# mkdir -p ./coverage
108+
# find ./coverage -name "coverage.txt" -exec cat {} + > ./coverage/coverage.txt
109+
#
110+
# - name: Upload results to Codecov
111+
# uses: codecov/codecov-action@v5
112+
# with:
113+
# token: ${{ secrets.codecov_token }}
114+
# slug: openecosystems/ecosystem
115+
# files: "./coverage/coverage.txt"
115116

116117
dependabot:
117118
#needs: [ build, vulnerability ]

‎.github/workflows/_nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,5 @@ jobs:
104104
- name: Run NX
105105
id: nx
106106
run: |
107-
pnpm exec nx run-many -t nightly -p ecosystem-v2alpha lighthouse-v2alpha
107+
pnpm exec nx run-many -t nightly
108108

‎.github/workflows/_snapshot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ jobs:
104104
- name: Run NX
105105
id: nx
106106
run: |
107-
pnpm exec nx run-many -t nightly -p apps-workloads-private-event-v2alpha-event-multiplexer apps-workloads-public-mesh-v2alpha-lighthouse
107+
pnpm exec nx run-many -t nightly

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
branches-ignore:
66
- main
77

8-
pull_request:
9-
types: [opened, reopened, synchronize]
10-
branches: [ "main" ]
8+
# pull_request:
9+
# types: [opened, reopened, synchronize]
10+
# branches: [ "main" ]
1111

1212
permissions:
1313
contents: write

‎.github/workflows/cd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: cd-dev-1
22
on:
33
push:
44
branches:
5-
- main
5+
- main-disabled
66
paths:
77
- 'infrastructure/env/dev-1.properties'
88
pull_request:
99
branches:
10-
- main
10+
- main-disabled
1111
paths:
1212
- 'infrastructure/env/dev-1.properties'
1313

‎.github/workflows/hugo.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
# Runs on pushes targeting the default branch
55
push:
66
branches:
7-
- main
7+
- main-disabled
88
paths:
99
- 'apps/web/public/docs/v2alpha/**'
1010

‎.github/workflows/snapshot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
types: [opened, reopened, synchronize]
88
branches:
9-
- main
9+
- main-disabled
1010

1111
#concurrency:
1212
# group: snapshot

‎.nx/workflows/agents.yaml‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ launch-templates:
4545
echo >> /home/workflows/.profile
4646
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
4747
echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"'
48-
brew install buf fastly/tap/fastly protobuf@3 hugo golangci-lint goreleaser/tap/goreleaser-pro goreleaser-pro ko
49-
/home/linuxbrew/.linuxbrew/bin/brew link --overwrite protobuf@3
48+
brew install buf golangci-lint
49+
brew install --cask goreleaser/tap/goreleaser-pro
5050
echo "PATH=$PATH:/home/workflows/go/bin" >> $NX_CLOUD_ENV
51-
echo "LDFLAGS=-L/home/linuxbrew/.linuxbrew/opt/protobuf@3/lib" >> $NX_CLOUD_ENV
52-
echo "CPPFLAGS=-I/home/linuxbrew/.linuxbrew/opt/protobuf@3/include" >> $NX_CLOUD_ENV
53-
echo "PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/opt/protobuf@3/lib/pkgconfig" >> $NX_CLOUD_ENV
51+
# brew install buf fastly/tap/fastly protobuf@3 hugo golangci-lint goreleaser/tap/goreleaser-pro goreleaser-pro ko
52+
# /home/linuxbrew/.linuxbrew/bin/brew link --overwrite protobuf@3
53+
# echo "LDFLAGS=-L/home/linuxbrew/.linuxbrew/opt/protobuf@3/lib" >> $NX_CLOUD_ENV
54+
# echo "CPPFLAGS=-I/home/linuxbrew/.linuxbrew/opt/protobuf@3/include" >> $NX_CLOUD_ENV
55+
# echo "PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/opt/protobuf@3/lib/pkgconfig" >> $NX_CLOUD_ENV
56+
5457

5558
# - name: Debug
5659
# script: |
@@ -59,22 +62,22 @@ launch-templates:
5962

6063
- name: Go Dependencies
6164
script: |
62-
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
63-
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2.0
6465
go install mvdan.cc/gofumpt@latest
6566
go install golang.org/x/vuln/cmd/govulncheck@latest
66-
# go install github.com/google/gnostic/cmd/protoc-gen-openapi@v0.6.8
67-
# go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.14.0
67+
# go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
68+
# go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2.0
69+
# go install github.com/google/gnostic/cmd/protoc-gen-openapi@v0.6.8
70+
# go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.14.0
6871

69-
- name: Rust Dependencies
70-
script: |
71-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81.0
72-
echo "PATH=/home/workflows/.cargo/bin:$PATH" >> $NX_CLOUD_ENV
73-
/home/workflows/.cargo/bin/rustup install 1.81.0
74-
/home/workflows/.cargo/bin/rustup target add wasm32-wasi --toolchain 1.81.0
75-
/home/workflows/.cargo/bin/rustup toolchain add 1.81.0
76-
/home/workflows/.cargo/bin/rustup target add wasm32-wasi --toolchain 1.81.0
77-
. "/home/workflows/.cargo/env"
72+
# - name: Rust Dependencies
73+
# script: |
74+
# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81.0
75+
# echo "PATH=/home/workflows/.cargo/bin:$PATH" >> $NX_CLOUD_ENV
76+
# /home/workflows/.cargo/bin/rustup install 1.81.0
77+
# /home/workflows/.cargo/bin/rustup target add wasm32-wasi --toolchain 1.81.0
78+
# /home/workflows/.cargo/bin/rustup toolchain add 1.81.0
79+
# /home/workflows/.cargo/bin/rustup target add wasm32-wasi --toolchain 1.81.0
80+
# . "/home/workflows/.cargo/env"
7881

7982
# - name: Dotnet Dependencies
8083
# script: |
@@ -92,10 +95,10 @@ launch-templates:
9295
# curl -o go/bin/protoc-gen-grpc-java -fsSL https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java/1.54.0/protoc-gen-grpc-java-1.54.0-linux-x86_64.exe
9396
# chmod +x go/bin/protoc-gen-grpc-java
9497

95-
- name: Install Binary Cache (if needed)
96-
script: |
97-
cd libs/partner/go/nebula/v1
98-
make generate
98+
# - name: Install Binary Cache (if needed)
99+
# script: |
100+
# cd go/oeco-sdk/bindings/nebula
101+
# make generate
99102

100103
- name: Git Config
101104
script: |

‎apps/clients/public/cli/v2alpha/oeco/project.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
"targets": {
77
"build": {
88
"executor": "nx:run-commands",
9-
"dependsOn": [
10-
{
11-
"target": "generate",
12-
"projects": ["libs-partner-go-nebula-v1"]
13-
}
14-
],
159
"outputs": [
1610
"{workspaceRoot}/dist/apps/clients/public/cli/v2alpha/oeco"
1711
],

‎go/oeco-sdk/v2beta/.goreleaser.sdk.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ variables:
1010
dist: ./dist/go/oeco-sdk/v2beta
1111

1212
monorepo:
13-
tag_prefix: "oeco-sdk-v2beta/"
13+
tag_prefix: "go/oeco-sdk/v2beta/"
1414
dir: go/oeco-sdk/v2beta
1515

1616
includes:
@@ -21,7 +21,7 @@ includes:
2121

2222
nightly:
2323
version_template: "{{ incpatch .Version }}-devel"
24-
tag_name: "oeco-sdk-v2beta/devel"
24+
tag_name: "go/oeco-sdk/v2beta/devel"
2525
publish_release: true
2626
keep_single_release: true
2727
#

0 commit comments

Comments
 (0)