Skip to content

Commit

Permalink
Namespace updates: create source directories (#46)
Browse files Browse the repository at this point in the history
* Reverse github and octokit directories in go-sdk

* Use pkg directory instead of octokit

* Use src directory for .NET

* Temporarily create update PRs on PR builds

* Undo temporary change
  • Loading branch information
kfcampbell authored Dec 12, 2023
1 parent b96f33a commit 2926a4c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
run: go run schemas/main.go --schema-next=false

- name: Run generation
run: time kiota generate -l csharp --ll trace -o $(pwd)/../dotnet-sdk/GitHub/Octokit -c OctokitClient -n GitHub.Octokit -d schemas/downloaded.json
run: time kiota generate -l csharp --ll trace -o $(pwd)/../dotnet-sdk/src/GitHub -c GitHubClient -n GitHub -d schemas/downloaded.json

- name: Build post-processing
run: go build -o post-processors/csharp/post-processor post-processors/csharp/main.go

- name: Run post-processing
run: post-processors/csharp/post-processor $(pwd)/../dotnet-sdk/GitHub/Octokit
run: post-processors/csharp/post-processor $(pwd)/../dotnet-sdk/src/GitHub

- name: Build generated and processed SDK
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: go run schemas/main.go --schema-next=false

- name: Run generation
run: kiota generate -l go --ll trace -o $(pwd)/../go-sdk/github/octokit -n "github.com/octokit/go-sdk/github/octokit/" -d schemas/downloaded.json
run: kiota generate -l go --ll trace -o $(pwd)/../go-sdk/pkg/github -n "github.com/octokit/go-sdk/pkg/github/" -d schemas/downloaded.json

- name: Build post-processing
run: go build -o post-processors/go/post-processor post-processors/go/main.go
Expand Down
6 changes: 3 additions & 3 deletions scripts/generate-csharp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
go run schemas/main.go --schema-next=false

# Execute generation
kiota generate -l csharp --ll trace -o generated/csharp/GitHub/Octokit -c OctokitClient -n GitHub.Octokit -d schemas/downloaded.json --co
kiota generate -l csharp --ll trace -o generated/csharp/src/GitHub -c GitHubClient -n GitHub -d schemas/downloaded.json --co

# Build and run post-processor
go build -o $(pwd)/post-processors/csharp/post-processor post-processors/csharp/main.go
$(pwd)/post-processors/csharp/post-processor $(pwd)/generated/csharp/GitHub/Octokit
$(pwd)/post-processors/csharp/post-processor $(pwd)/generated/csharp/src/GitHub

# Build and run the generated code and call the API via generated SDK
cd generated/csharp/GitHub
cd generated/csharp/src
dotnet restore
dotnet run --project GitHub.Octokit.csproj
2 changes: 1 addition & 1 deletion scripts/generate-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
set -ex

go run schemas/main.go --schema-next=false
kiota generate -l go --ll trace -o $(pwd)/../go-sdk/github/octokit -n octokit -d schemas/downloaded.json
kiota generate -l go --ll trace -o $(pwd)/../go-sdk/pkg/github -n github.com/octokit/go-sdk/pkg/github -d schemas/downloaded.json
go build -o post-processors/go/post-processor post-processors/go/main.go
cd $(pwd)/../go-sdk
$(pwd)/../source-generator/post-processors/go/post-processor $(pwd)
Expand Down

0 comments on commit 2926a4c

Please sign in to comment.