Skip to content

Commit 0850990

Browse files
authored
Merge branch 'master' into development-cloudconfig
2 parents 2b4022b + 5eed695 commit 0850990

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

.github/scripts/create-release.sh

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,13 @@ if [ "$VARIANT" = "SNAPSHOT" ]; then
3838
echo "Invalid snapshot version: $REL_VERSION"
3939
exit 3
4040
fi
41-
branch_name="automation/update_to_next_${current_time}"
42-
git checkout -b $branch_name
41+
42+
# Change is done directly in the master branch.
4343
${script_dir}/update_sdk_version.sh $REL_VERSION
44-
git clean -xdf
4544
git commit -s -m "Update master version to ${REL_VERSION}" -a
46-
git push origin $branch_name
47-
gh pr create --repo ${GITHUB_REPOSITORY} \
48-
--base master \
49-
--title "Update master version to ${REL_VERSION}" \
50-
--body "Update master version to ${REL_VERSION}"
51-
echo "Done."
45+
git clean -f -d
46+
git push origin master
47+
echo "Updated master branch with version ${REL_VERSION}."
5248
exit 0
5349
elif [ "$VARIANT" = "rc" ]; then
5450
echo "Release-candidate version detected: $REL_VERSION"
@@ -107,15 +103,12 @@ fi
107103

108104
if [ "$VARIANT" = "" ]; then
109105
git clean -xdf
110-
echo "Creating pull request to update docs ..."
111-
branch_name="automation/update_docs_${current_time}"
106+
echo "Updating docs in master branch ..."
107+
git checkout master
112108
git reset --hard origin/master
113109
git cherry-pick --strategy=recursive -X theirs $RELEASE_TAG
114-
git push origin $branch_name
115-
gh pr create --repo ${GITHUB_REPOSITORY} \
116-
--base master \
117-
--title "Update master docs for ${REL_VERSION} release" \
118-
--body "Update master docs for ${REL_VERSION} release"
110+
git push origin master
111+
echo "Updated docs in master branch."
119112
fi
120113

121114
echo "Done."

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ jobs:
181181
echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
182182
export GPG_TTY=$(tty)
183183
gpg --batch --import private-key.gpg
184-
./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy -pl \!examples
184+
./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy -Pdeploy-profile

.github/workflows/create-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ jobs:
6868
env:
6969
GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }}
7070
run: |
71-
gh workflow run build.yml --repo ${GITHUB_REPOSITORY} --ref v$(echo '${{ env.BUILD_GIT_REF }}' | sed -r 's/^[vV]?([0-9].+)$/\1/')
71+
gh workflow run build.yml --repo ${GITHUB_REPOSITORY} --ref '${{ env.BUILD_GIT_REF }}'

pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,19 @@
343343
</modules>
344344

345345
<profiles>
346+
<profile>
347+
<id>deploy-profile</id>
348+
<modules>
349+
<!-- Include only the modules to be deployed -->
350+
<module>sdk-autogen</module>
351+
<module>sdk</module>
352+
<module>sdk-actors</module>
353+
<module>sdk-springboot</module>
354+
<module>sdk-workflows</module>
355+
<module>testcontainers-dapr</module>
356+
<module>dapr-spring</module>
357+
</modules>
358+
</profile>
346359
<profile>
347360
<id>integration-tests</id>
348361
<modules>

0 commit comments

Comments
 (0)