Skip to content

Commit 58ac3a5

Browse files
authored
Merge branch 'main' into release-please--branches--main--components--launchdarkly-java-sdk-common
2 parents 04866d8 + a8fd9d9 commit 58ac3a5

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

.github/actions/full-release/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ inputs:
1010
prerelease:
1111
description: 'Is this a prerelease. If so then it will be published to the staging repository only.'
1212
required: true
13+
run_tests:
14+
description: 'If true, run unit tests, otherwise skip them.'
15+
required: false
16+
type: boolean
17+
default: true
1318
signing_key_id:
1419
description: 'Signing key ID'
1520
required: true
@@ -40,6 +45,7 @@ runs:
4045
with:
4146
workspace_path: ${{ inputs.workspace_path }}
4247
java_version: 8
48+
run_tests: ${{ inputs.run_tests }}
4349

4450
- name: Publish
4551
uses: ./.github/actions/publish

.github/workflows/manual-publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
with:
4949
workspace_path: ${{ inputs.workspace_path }}
5050
dry_run: ${{ inputs.dry_run }}
51+
run_tests: ${{ inputs.run_tests }}
5152
prerelease: ${{ inputs.prerelease }}
5253
signing_key_id: ${{ env.SIGNING_KEY_ID }}
5354
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}

.github/workflows/release-please.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
outputs:
13-
package-sdk-common-released: ${{ steps.release.outputs['lib/java-sdk-common--release_created'] }}
14-
package-sdk-internal-released: ${{ steps.release.outputs['lib/java-sdk-internal--release_created'] }}
15-
package-server-sdk-released: ${{ steps.release.outputs['lib/java-server-sdk--release_created'] }}
13+
package-sdk-common-released: ${{ steps.release.outputs['lib/shared/common--release_created'] }}
14+
package-sdk-internal-released: ${{ steps.release.outputs['lib/shared/internal--release_created'] }}
15+
package-server-sdk-released: ${{ steps.release.outputs['lib/sdk/server--release_created'] }}
1616
package-server-sdk-otel-released: ${{ steps.release.outputs['lib/java-server-sdk-otel--release_created'] }}
1717
package-server-sdk-redis-store-released: ${{ steps.release.outputs['lib/java-server-sdk-redis-store--release_created'] }}
1818

1919
steps:
20-
- uses: google-github-actions/release-please-action@v4
20+
- uses: googleapis/release-please-action@v4
2121
id: release
2222
with:
2323
token: ${{ secrets.GITHUB_TOKEN }}
@@ -141,8 +141,8 @@ jobs:
141141
- uses: ./.github/actions/full-release
142142
with:
143143
workspace_path: lib/shared/internal
144-
dry_run: true #TODO make this false after testing
145-
prerelease: true #TODO make this false after testing
144+
dry_run: false
145+
prerelease: false
146146
code_signing_keyring: 'code-signing-keyring.gpg'
147147
signing_key_id: ${{ env.SIGNING_KEY_ID }}
148148
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
@@ -174,8 +174,8 @@ jobs:
174174
- uses: ./.github/actions/full-release
175175
with:
176176
workspace_path: lib/shared/common
177-
dry_run: true #TODO make this false after testing
178-
prerelease: true #TODO make this false after testing
177+
dry_run: false
178+
prerelease: false
179179
code_signing_keyring: 'code-signing-keyring.gpg'
180180
signing_key_id: ${{ env.SIGNING_KEY_ID }}
181181
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"lib/java-server-sdk-otel": "0.1.0",
33
"lib/java-server-sdk-redis-store": "3.0.1",
44
"lib/shared/common": "2.2.0",
5-
"lib/shared/internal": "1.3.0",
5+
"lib/shared/internal": "1.4.0",
66
"lib/sdk/server": "7.7.0"
77
}

lib/shared/internal/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to the project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org).
44

5+
## [1.4.0](https://github.com/launchdarkly/java-core/compare/launchdarkly-java-sdk-internal-v1.3.0...launchdarkly-java-sdk-internal-1.4.0) (2025-05-08)
6+
7+
8+
### Features
9+
10+
* Support inline context for custom and migration events ([#55](https://github.com/launchdarkly/java-core/issues/55)) ([7a6a1db](https://github.com/launchdarkly/java-core/commit/7a6a1db5bf1c0643dc19e0998137e9b16f16f7d8))
11+
512
## [1.3.0] - 2024-03-13
613
### Changed:
714
- Redact anonymous attributes within feature events

lib/shared/internal/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#x-release-please-start-version
2-
version=1.3.0
2+
version=1.4.0
33
#x-release-please-end
44

55
# Used only in Android CI test build:

0 commit comments

Comments
 (0)