Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PWN-6722 - Changelog fixes & Kotlin DSL migration #1257

Merged
merged 43 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e2878ba
PWN-6722 - Changelog fixes
1sakov Feb 15, 2023
960b5af
PWN-6722 - Changelog fixes 2
1sakov Feb 15, 2023
ff47a2f
PWN-6722 - Changelog fixes 3
1sakov Feb 15, 2023
dd3fe76
PWN-6722 - Changelog fixes 4
1sakov Feb 15, 2023
6ee21e9
PWN-6722 - commenting assemble step, checking logs
1sakov Feb 15, 2023
f8ebe02
PWN-6722 - commenting assemble step, checking logs 2
1sakov Feb 15, 2023
509fcbc
PWN-6722 - Migrated to Kotlin DSL, updated changelog
1sakov Feb 15, 2023
a3e72ae
PWN-6722 - Moved generate changelog to script
1sakov Feb 15, 2023
4e5e7f0
PWN-6722 - Permission for script
1sakov Feb 15, 2023
9c37a67
PWN-6722 - Permission for script 2
1sakov Feb 15, 2023
a094e0a
PWN-6722 - Changelog fixes
1sakov Feb 15, 2023
59cae4d
PWN-6722 - Changelog fixes 2
1sakov Feb 15, 2023
927e828
PWN-6722 - Changelog fixes 3
1sakov Feb 16, 2023
eabf751
PWN-6722 - Changelog fixes 4
1sakov Feb 16, 2023
e1b95c4
PWN-6722 - Changelog fixes 5
1sakov Feb 16, 2023
d1390f3
PWN-6722 - Changelog fixes 6
1sakov Feb 16, 2023
b5ad079
PWN-6722 - Changelog fixes 7
1sakov Feb 16, 2023
44afa70
PWN-6722 - Changelog fixes 8
1sakov Feb 16, 2023
7635cf2
PWN-6722 - Changelog fixes 9
1sakov Feb 16, 2023
d99437a
PWN-6722 - Changelog fixes 10
1sakov Feb 16, 2023
9abfc7a
PWN-6722 - Changelog fixes 11
1sakov Feb 16, 2023
b1eee9f
PWN-6722 - Changelog fixes 12
1sakov Feb 16, 2023
25d3700
PWN-6722 - Changelog fixes 13
1sakov Feb 16, 2023
4ff7dda
PWN-6722 - Changelog fixes 14
1sakov Feb 16, 2023
fcc97fa
PWN-6722 - Changelog fixes 15
1sakov Feb 16, 2023
e782015
PWN-6722 - Changelog fixes 16
1sakov Feb 16, 2023
47579b6
PWN-6722 - Changelog fixes 17
1sakov Feb 16, 2023
a1893c1
PWN-6722 - Changelog fixes 18
1sakov Feb 16, 2023
f7cb28a
PWN-6722 - Changelog fixes 19
1sakov Feb 16, 2023
eb59123
PWN-6722 - Try fix changelog
1sakov Feb 20, 2023
974f5a8
PWN-6722 - Try fix changelog 2
1sakov Feb 20, 2023
17f1b86
PWN-6722 - Try fix changelog 3
1sakov Feb 20, 2023
e62685d
PWN-6722 - Try fix changelog 4
1sakov Feb 20, 2023
380a381
PWN-6722 - Try fix changelog 5
1sakov Feb 20, 2023
59c883b
PWN-6722 - Try fix changelog 6
1sakov Feb 20, 2023
62e274c
PWN-6722 - Try fix changelog 7
1sakov Feb 20, 2023
f3aeb6f
PWN-6722 - Try fix changelog 8
1sakov Feb 20, 2023
5834339
PWN-6722 - Try fix changelog 9
1sakov Feb 20, 2023
a7bc128
PWN-6722 - Try fix changelog 10
1sakov Feb 20, 2023
9ab65ef
PWN-6722 - Try fix changelog 11
1sakov Feb 20, 2023
1d59a7b
PWN-6722 - Try fix changelog 12
1sakov Feb 20, 2023
256c2d7
PWN-6722 - Try fix changelog 13
1sakov Feb 20, 2023
5e66c29
PWN-6722 - Fixed changelog, cleaning
1sakov Feb 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/setup-jira-rft/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ runs:
echo "JIRA Ticket: $jira_ticket"
env:
jira-ticket: ${{ steps.find-jira-ticket.outputs.jira_ticket }}
- name: Update JIRA issue status
- name: "Update JIRA issue status"
shell: bash
if: env.jira-ticket
if: steps.find-jira-ticket.outputs.jira_ticket != ''
run: |
curl -D- -H "Authorization: Basic ${{ inputs.jira-api-token }}" \
-X PUT \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-feature-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: |
cd bash_scripts
value=`cat timestamp.txt`
bash slack_shortlog_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} "develop"
bash slack_develop_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
cd ..

- name: "Send finish deploy message to slack"
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/android-release-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ jobs:
steps:
- name: "Checkout to the current commit hash"
uses: actions/checkout@v3
- name: "Send start deploy message to slack"
run: |
cd bash_scripts
bash slack_deploy_start_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }}
cd ..

- name: "Create release signing configs properties"
uses: ./.github/actions/setup-signing-configs
with:
Expand Down Expand Up @@ -61,16 +55,4 @@ jobs:
bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
build-type: "release"
artifact-type: "bundle"
- name: "Upload git changelog and Jira ticket to Slack channel"
run: |
cd bash_scripts
value=`cat timestamp.txt`
bash slack_shortlog_changelog.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} "main"
cd ..

- name: "Send finish deploy message to Slack"
run: |
cd bash_scripts
value=`cat timestamp.txt`
bash slack_deploy_finish_message.sh ${{ secrets.SLACK_BOT_TOKEN }} ${{ secrets.SLACK_CHANNEL_ID }} $value
artifact-type: "bundle"
24 changes: 16 additions & 8 deletions bash_scripts/slack_develop_changelog.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
#!/bin/bash
git fetch

printf "$(git log -1 --pretty=format:'%b' develop)" > changelog.txt
# Set the branch names
start_branch=develop
end_branch=$(git rev-parse --abbrev-ref HEAD)

curl \
-F token="$1" \
-F channels="$2" \
-F initial_comment="List of changes included in the build" \
-F [email protected] \
https://slack.com/api/files.upload
# Fetch the latest changes
git fetch origin

# Get the range of commits between the two branches
commits=$(git log --pretty=format:"%h - %s (%b) - %an" ${start_branch}..${end_branch})

changelog_message="*CHANGELOG*
$commits"

curl \
-F token="$1" \
-F channel="$2"\
-F text="$changelog_message" \
https://slack.com/api/chat.postMessage