a25ba7bfd9
* Clean up unused envvar Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Make the gitflow workflow reusable Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Add support for resetting dependencies to develop after merge Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Rename workflow file Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
96 lines
3.7 KiB
YAML
96 lines
3.7 KiB
YAML
# Gitflow merge-back master->develop
|
|
name: Merge master -> develop
|
|
on:
|
|
push:
|
|
branches: [master]
|
|
workflow_call:
|
|
secrets:
|
|
ELEMENT_BOT_TOKEN:
|
|
required: true
|
|
inputs:
|
|
dependencies:
|
|
description: List of dependencies to reset.
|
|
type: string
|
|
required: false
|
|
concurrency: ${{ github.workflow }}
|
|
jobs:
|
|
merge:
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
with:
|
|
token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
|
fetch-depth: 0
|
|
|
|
- uses: actions/setup-node@v3
|
|
with:
|
|
cache: "yarn"
|
|
|
|
- name: Install Deps
|
|
run: "yarn install --frozen-lockfile"
|
|
|
|
- name: Set up git
|
|
run: |
|
|
git config --global user.email "releases@riot.im"
|
|
git config --global user.name "RiotRobot"
|
|
|
|
- name: Merge to develop
|
|
run: |
|
|
git checkout develop
|
|
git merge -X ours master
|
|
|
|
- name: Update package.json fields
|
|
run: |
|
|
# When merging to develop, we need revert the `main` and `typings` fields if we adjusted them previously.
|
|
for i in main typings browser
|
|
do
|
|
# If a `lib` prefixed value is present, it means we adjusted the field
|
|
# earlier at publish time, so we should revert it now.
|
|
if [ "$(jq -r ".matrix_lib_$i" package.json)" != "null" ]; then
|
|
# If there's a `src` prefixed value, use that, otherwise delete.
|
|
# This is used to delete the `typings` field and reset `main` back to the TypeScript source.
|
|
src_value=$(jq -r ".matrix_src_$i" package.json)
|
|
if [ "$src_value" != "null" ]; then
|
|
jq ".$i = .matrix_src_$i" package.json > package.json.new && mv package.json.new package.json && yarn prettier --write package.json
|
|
else
|
|
jq "del(.$i)" package.json > package.json.new && mv package.json.new package.json && yarn prettier --write package.json
|
|
fi
|
|
fi
|
|
done
|
|
|
|
git add package.json
|
|
git commit -m "Resetting package fields for development"
|
|
|
|
- name: Reset dependencies
|
|
if: inputs.dependencies
|
|
run: |
|
|
while IFS= read -r PACKAGE; do
|
|
[ -z "$PACKAGE" ] && continue
|
|
|
|
CURRENT_VERSION=$(cat package.json | jq -r .dependencies[\"$PACKAGE\"])
|
|
echo "Current $PACKAGE version is $CURRENT_VERSION"
|
|
|
|
if [ "$CURRENT_VERSION" == "null" ]
|
|
then
|
|
echo "Unable to find $PACKAGE in package.json"
|
|
exit 1
|
|
fi
|
|
|
|
if [ "$CURRENT_VERSION" == "develop" ]
|
|
then
|
|
echo "Not updating dependency $PACKAGE"
|
|
continue
|
|
fi
|
|
|
|
echo "Resetting $1 to develop branch..."
|
|
yarn add "github:matrix-org/$PACKAGE#develop"
|
|
git add -u
|
|
git commit -m "Reset $PACKAGE back to develop branch"
|
|
done <<< "$DEPENDENCIES"
|
|
env:
|
|
DEPENDENCIES: ${{ inputs.dependencies }}
|
|
FINAL: ${{ inputs.final }}
|
|
|
|
- name: Push changes
|
|
run: git push origin develop
|