Skip to content

Commit 2fe55ce

Browse files
committed
Merge branch 'main' of github.com:launchdarkly/ld-openapi-private
2 parents 3975422 + a01aa45 commit 2fe55ce

30 files changed

Lines changed: 4356 additions & 419 deletions

File tree

.github/runs-on.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
_extends: .github-private
1+
_extends: .github-private

.github/workflows/ci.yml

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: CI (build + client samples)
55
- main
66

77
env:
8-
LD_API_KEY: ${{ secrets.LD_API_KEY }}
8+
LD_API_KEY: ${{ secrets.LD_API_KEY }}
99

1010
permissions:
1111
contents: read
@@ -82,33 +82,9 @@ jobs:
8282
- name: Run Go sample
8383
env:
8484
GO111MODULE: 'on'
85-
run: make
86-
test-javascript:
87-
runs-on: ubuntu-latest
88-
needs: build
89-
steps:
90-
- uses: actions/checkout@v4
91-
- name: Download targets
92-
uses: actions/download-artifact@v4
93-
with:
94-
name: targets
95-
path: targets
96-
- uses: actions/setup-node@v4
97-
with:
98-
node-version: '20'
99-
- name: Build JS client
100-
working-directory: targets/api-client-javascript
10185
run: |
102-
rm -rf node_modules dist
103-
npm install
104-
npx --yes babel src -d dist --plugins @babel/plugin-transform-modules-commonjs
105-
# TODO: Fix this test
106-
# - name: Run JS sample
107-
# run: |
108-
# cd samples/javascript
109-
# # Install the local package directly
110-
# npm install
111-
# node index.js
86+
cd samples/go
87+
make
11288
test-python:
11389
runs-on: ubuntu-latest
11490
needs: build
@@ -210,37 +186,16 @@ jobs:
210186
npm install
211187
npm run build
212188
npm start
213-
test-php:
214-
runs-on: ubuntu-latest
215-
needs: build
216-
steps:
217-
- uses: actions/checkout@v4
218-
- name: Download targets
219-
uses: actions/download-artifact@v4
220-
with:
221-
name: targets
222-
path: targets
223-
- uses: shivammathur/setup-php@v2
224-
with:
225-
php-version: '8.1'
226-
- name: Run PHP sample
227-
working-directory: samples/php
228-
run: |
229-
echo '{"require":{"launchdarkly/api-client-php":"@dev","guzzlehttp/guzzle":"*"},"repositories":[{"type":"path","url":"../../targets/api-client-php","options":{"symlink":true}}]}' > composer.json
230-
composer update
231-
php index.php
232189
233190
check-success:
234191
name: Check Success
235192
needs:
236193
- build
237194
- test-go
238-
- test-javascript
239195
- test-python
240196
- test-ruby
241197
- test-java
242198
- test-typescript
243-
- test-php
244199
if: always()
245200
runs-on: ubuntu-latest
246201
steps:
@@ -249,4 +204,4 @@ jobs:
249204
if printf '${{ toJSON(needs) }}' | grep --quiet --extended-regexp --ignore-case '"result": "(failure|cancelled)"'; then
250205
printf "Tests failed or workflow cancelled:\n\n${{ toJSON(needs) }}"
251206
exit 1
252-
fi
207+
fi

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = /home/runner/code-signing-keyring.gpg'
5252
- name: Prepare secrets
5353
run: |
54-
./scripts/release/prepare.sh
54+
./scripts/release/prepare.sh
5555
- name: Build clients
5656
run: |
5757
export PATH=/opt/gradle/bin:/usr/local/go/bin:$HOME/.rubygems/bin:$PATH
5858
export GEM_HOME=$HOME/.rubygems
5959
java -XX:+PrintFlagsFinal -version | grep ThreadStackSize
6060
make
6161
# Verify that the generated client code can be built
62-
make BUILD_TARGETS="go java javascript python ruby typescript-axios" build_clients
62+
make BUILD_TARGETS="go java python ruby typescript-axios" build_clients
6363
# This step will:
6464
# * Push built clients to their respective Github repos
6565
# * Tag those commits with the release version
@@ -77,11 +77,11 @@ jobs:
7777
needs: release
7878
strategy:
7979
matrix:
80-
repo: ['api-client-go', 'api-client-java', 'api-client-javascript', 'api-client-php', 'api-client-python', 'api-client-ruby', 'api-client-typescript']
80+
repo: ['api-client-go', 'api-client-java', 'api-client-python', 'api-client-ruby', 'api-client-typescript']
8181
steps:
8282
- uses: ncipollo/release-action@v1.14.0
8383
with:
8484
repo: ${{ matrix.repo }}
8585
token: ${{ secrets.BOT_TOKEN }}
86-
tag: v${{ inputs.releaseVersion }}
86+
tag: v${{ inputs.releaseVersion }}
8787
body: ${{ inputs.changeLog }}

.ldrelease/build.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

.ldrelease/config.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.ldrelease/prepare.sh

Lines changed: 0 additions & 38 deletions
This file was deleted.

.ldrelease/publish-dry-run.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

.ldrelease/publish.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

.ldrelease/secrets.properties

Lines changed: 0 additions & 17 deletions
This file was deleted.

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @launchdarkly/team-enterprise
1+
* @launchdarkly/team-fm-next

0 commit comments

Comments
 (0)