Skip to content

Commit b389eff

Browse files
HardNorthHardNorth
committed
pipeline revert
1 parent 36dced1 commit b389eff

2 files changed

Lines changed: 49 additions & 50 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -68,51 +68,51 @@ jobs:
6868
-Prelease.newVersion=${{ env.NEXT_VERSION }} -PbintrayUser=${{ secrets.BINTRAY_USER }} \
6969
-PbintrayApiKey=${{ secrets.BINTRAY_API_KEY }} -PgithubUserName=${{ env.GH_USER_NAME }} -PgithubToken=${{ secrets.GITHUB_TOKEN }}
7070
71-
# - name: Read changelog Entry
72-
# id: readChangelogEntry
73-
# uses: mindsers/[email protected]
74-
# with:
75-
# version: 'Unreleased'
76-
# path: ./${{ env.CHANGE_LOG_FILE }}
77-
#
78-
# - name: Update CHANGELOG.md
79-
# id: changelogUpdate
80-
# run: |
81-
# sed '/\[Unreleased\]/q' ${{ env.CHANGE_LOG_FILE }} >> ${{ env.CHANGE_LOG_TMP_FILE }}
82-
# sed -E '1,/#?#\s*\[Unreleased\]/d' ${{ env.CHANGE_LOG_FILE }} | sed -E '/#?#\s*\[/q' | \
83-
# { echo -e '\n## [${{env.RELEASE_VERSION}}]'; sed '$d'; } >> ${{ env.CHANGE_LOG_TMP_FILE }}
84-
# grep -E '#?#\s*\[[0-9]' ${{ env.CHANGE_LOG_FILE }} | head -n1 >> ${{ env.CHANGE_LOG_TMP_FILE }}
85-
# sed -E '1,/#?#\s*\[[0-9]/d' ${{ env.CHANGE_LOG_FILE }} >> ${{ env.CHANGE_LOG_TMP_FILE }}
86-
# rm ${{ env.CHANGE_LOG_FILE }}
87-
# mv ${{ env.CHANGE_LOG_TMP_FILE }} ${{ env.CHANGE_LOG_FILE }}
88-
# git add ${{ env.CHANGE_LOG_FILE }}
89-
# git commit -m "Changelog update"
90-
# git push
91-
#
92-
# - name: Create Release
93-
# id: createRelease
94-
# uses: actions/create-release@v1
95-
# env:
96-
# GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
97-
# with:
98-
# tag_name: ${{ env.RELEASE_VERSION }}
99-
# release_name: Release ${{ env.RELEASE_VERSION }}
100-
# body: ${{ steps.readChangelogEntry.outputs.log_entry }}
101-
# draft: false
102-
# prerelease: false
103-
#
104-
# - name: Checkout develop branch
105-
# if: ${{github.ref}} == 'master'
106-
# uses: actions/checkout@v2
107-
# with:
108-
# ref: 'develop'
109-
# fetch-depth: 0
110-
#
111-
# - name: Merge release branch into develop
112-
# id: mergeIntoDevelop
113-
# if: ${{github.ref}} == 'master'
114-
# run: |
115-
# git merge -m 'Merge master branch into develop after a release' origin/master
116-
# git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \
117-
# | { echo -e 'Unable to merge master into develop, merge conflicts:'; (! grep -Eo '[^ ]+$') }
118-
# git push origin develop
71+
- name: Read changelog Entry
72+
id: readChangelogEntry
73+
uses: mindsers/[email protected]
74+
with:
75+
version: 'Unreleased'
76+
path: ./${{ env.CHANGE_LOG_FILE }}
77+
78+
- name: Update CHANGELOG.md
79+
id: changelogUpdate
80+
run: |
81+
sed '/\[Unreleased\]/q' ${{ env.CHANGE_LOG_FILE }} >> ${{ env.CHANGE_LOG_TMP_FILE }}
82+
sed -E '1,/#?#\s*\[Unreleased\]/d' ${{ env.CHANGE_LOG_FILE }} | sed -E '/#?#\s*\[/q' | \
83+
{ echo -e '\n## [${{env.RELEASE_VERSION}}]'; sed '$d'; } >> ${{ env.CHANGE_LOG_TMP_FILE }}
84+
grep -E '#?#\s*\[[0-9]' ${{ env.CHANGE_LOG_FILE }} | head -n1 >> ${{ env.CHANGE_LOG_TMP_FILE }}
85+
sed -E '1,/#?#\s*\[[0-9]/d' ${{ env.CHANGE_LOG_FILE }} >> ${{ env.CHANGE_LOG_TMP_FILE }}
86+
rm ${{ env.CHANGE_LOG_FILE }}
87+
mv ${{ env.CHANGE_LOG_TMP_FILE }} ${{ env.CHANGE_LOG_FILE }}
88+
git add ${{ env.CHANGE_LOG_FILE }}
89+
git commit -m "Changelog update"
90+
git push
91+
92+
- name: Create Release
93+
id: createRelease
94+
uses: actions/create-release@v1
95+
env:
96+
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
97+
with:
98+
tag_name: ${{ env.RELEASE_VERSION }}
99+
release_name: Release ${{ env.RELEASE_VERSION }}
100+
body: ${{ steps.readChangelogEntry.outputs.log_entry }}
101+
draft: false
102+
prerelease: false
103+
104+
- name: Checkout develop branch
105+
if: ${{github.ref}} == 'master'
106+
uses: actions/checkout@v2
107+
with:
108+
ref: 'develop'
109+
fetch-depth: 0
110+
111+
- name: Merge release branch into develop
112+
id: mergeIntoDevelop
113+
if: ${{github.ref}} == 'master'
114+
run: |
115+
git merge -m 'Merge master branch into develop after a release' origin/master
116+
git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \
117+
| { echo -e 'Unable to merge master into develop, merge conflicts:'; (! grep -Eo '[^ ]+$') }
118+
git push origin develop

‎release.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ bintray {
9191
}
9292
}
9393

94-
//def releaseDependencies = [bintrayUpload, publish]
95-
def releaseDependencies = [bintrayUpload]
94+
def releaseDependencies = [bintrayUpload, publish]
9695
releaseDependencies.addAll(afterReleaseBuild.getDependsOn())
9796
afterReleaseBuild.setDependsOn(releaseDependencies)

0 commit comments

Comments
 (0)