Skip to content

Commit bb87aa9

Browse files
Merge pull request #221 from skyflowapi/beta-release/25.9.1
SK-2283 Merge changes into V3
2 parents eb1336d + e702815 commit bb87aa9

File tree

123 files changed

+3824
-4516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3824
-4516
lines changed

.github/workflows/beta-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ jobs:
77
uses: ./.github/workflows/shared-build-and-deploy.yml
88
with:
99
ref: ${{ github.ref_name }}
10-
server-id: ossrh
10+
server-id: central
1111
profile: maven-central
1212
tag: 'beta'
13+
module: 'v3'
1314
secrets:
1415
server-username: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_USERNAME }}
1516
server-password: ${{ secrets.CENTRAL_PUBLISHER_PORTAL_PASSWORD }}
1617
gpg-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
1718
gpg-passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
1819
skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
1920
test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
20-
test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
21+
test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
name: Publish package to the JFROG Artifactory
1+
name: Publish v3 module to the JFROG Artifactory
22
on:
33
push:
44
tags-ignore:
55
- '*.*'
66
paths-ignore:
77
- "*.md"
88
branches:
9-
- release/*
9+
- v3-release/*
1010

1111
jobs:
12-
build-and-deploy:
12+
build-and-deploy-v3:
1313
uses: ./.github/workflows/shared-build-and-deploy.yml
1414
with:
1515
ref: ${{ github.ref_name }}
1616
server-id: central
1717
profile: jfrog
1818
tag: 'internal'
19+
module: 'v3'
1920
secrets:
2021
server-username: ${{ secrets.ARTIFACTORY_USERNAME }}
2122
server-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
2223
gpg-key: ${{ secrets.JFROG_GPG_KEY }}
2324
gpg-passphrase: ${{ secrets.JFROG_GPG_PASSPHRASE }}
2425
skyflow-credentials: ${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
2526
test-expired-token: ${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
26-
test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
27+
test-reusable-token: ${{ secrets.TEST_REUSABLE_TOKEN }} >> .env

.github/workflows/shared-build-and-deploy.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ on:
2121
description: 'Release Tag'
2222
required: true
2323
type: string
24+
25+
module:
26+
description: 'Module to build and publish'
27+
required: false
28+
type: string
29+
default: ''
30+
2431
secrets:
2532
server-username:
2633
required: true
@@ -54,7 +61,7 @@ jobs:
5461
- name: Set up maven or jfrog repository
5562
uses: actions/setup-java@v1
5663
with:
57-
java-version: "1.8"
64+
java-version: "11"
5865
distribution: "adopt"
5966
server-id: ${{ inputs.server-id }}
6067
server-username: SERVER_USERNAME
@@ -87,7 +94,7 @@ jobs:
8794
if ${{ inputs.tag == 'internal' }}; then
8895
./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}" "$(git rev-parse --short "$GITHUB_SHA")"
8996
else
90-
./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}"
97+
./scripts/bump_version.sh "${{ steps.previoustag.outputs.tag }}" "" "${{ inputs.module }}"
9198
fi
9299
93100
- name: Commit changes
@@ -99,7 +106,7 @@ jobs:
99106
git checkout ${{ env.branch_name }}
100107
fi
101108
102-
git add pom.xml
109+
git add v3/pom.xml
103110
if [[ "${{ inputs.tag }}" == "internal" ]]; then
104111
git commit -m "[AUTOMATED] Private Release ${{ steps.previoustag.outputs.tag }}-dev-$(git rev-parse --short $GITHUB_SHA)"
105112
git push origin ${{ github.ref_name }} -f
@@ -125,9 +132,14 @@ jobs:
125132
json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
126133

127134
- name: Publish package
128-
run: mvn --batch-mode deploy -P ${{ inputs.profile }}
135+
run: |
136+
if [[ "${{ inputs.tag }}" == "internal" ]]; then
137+
mvn --batch-mode -pl ${{ inputs.module }} -am deploy -P jfrog
138+
elif [[ "${{ inputs.tag }}" == "beta" || "${{ inputs.tag }}" == "public" ]]; then
139+
mvn --batch-mode -pl ${{ inputs.module }} -am deploy -P ${{ inputs.profile }}
140+
fi
129141
130142
env:
131143
SERVER_USERNAME: ${{ secrets.server-username }}
132144
SERVER_PASSWORD: ${{ secrets.server-password }}
133-
GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }}
145+
GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }}

0 commit comments

Comments
 (0)