kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-03 11:08:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-4692130362

Browse Source
This commit is contained in:
mergify[bot]
2025-03-16 16:44:48 +00:00
committed by GitHub
parent 442cf7f9b3 8517af105d
commit 5dd49fc1e1
1 changed files with 178 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

252
.github/workflows/release.yml vendored
View File

@@ -29,33 +29,39 @@ jobs:
passphrase: ${{ secrets.PASSPHRASE }} passphrase: ${{ secrets.PASSPHRASE }}
git_user_signingkey: true git_user_signingkey: true
git_commit_gpgsign: true git_commit_gpgsign: true
- name: Switch branch
run: |
if [[ "develop" == "$version" ]]; then
echo "The branch is 'develop'"
git checkout --track origin/develop
git pull
elif [[ "$version" == branch* ]]; then
PULLBRANCH=${version:7}
echo "The branch is '$PULLBRANCH' ($version)"
git checkout --track origin/$PULLBRANCH
git pull
else
echo "The branch is 'main'"
git config user.name github-actions
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
git checkout --track origin/develop
git pull
git checkout main
git merge develop
fi
env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: ${{ github.event.inputs.phpversion }} php-version: ${{ github.event.inputs.phpversion }}
extensions: mbstring, intl, zip, bcmath extensions: mbstring, intl, zip, bcmath
- name: Switch and pull
run: |
#
# Always check out origin/develop, unless its a branch release.
#
BRANCH_TO_PULL=origin/develop
if [[ "$version" == branch* ]]; then
BRANCH_TO_PULL=origin/$version
fi
echo "Version is '$version', check out '$BRANCH_TO_PULL'-branch"
git checkout --track $BRANCH_TO_PULL
git pull
echo "Current branch is $(git branch --show-current)"
echo 'Add test change'
echo $(date) > temp-file.txt
env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Configure Git
run: |
# do some configuration
sudo timedatectl set-timezone Europe/Amsterdam
git config user.name JC5
git config user.email release@firefly-iii.org
git config advice.addIgnoredFile false
git config push.autoSetupRemote true
- name: crowdin action - name: crowdin action
uses: crowdin/github-action@v2 uses: crowdin/github-action@v2
with: with:
@@ -143,14 +149,8 @@ jobs:
composer update --no-dev --no-scripts --no-plugins -q composer update --no-dev --no-scripts --no-plugins -q
sudo chown -R runner:docker resources/lang sudo chown -R runner:docker resources/lang
.ci/phpcs.sh || true .ci/phpcs.sh || true
- name: Release - name: Calculate variables
run: | run: |
# do some configuration
sudo timedatectl set-timezone Europe/Amsterdam
git config user.name JC5
git config user.email release@firefly-iii.org
git config advice.addIgnoredFile false
git config push.autoSetupRemote true
# set some variables # set some variables
releaseName=$version releaseName=$version
@@ -158,10 +158,6 @@ jobs:
zipName=FireflyIII-$version.zip zipName=FireflyIII-$version.zip
tarName=FireflyIII-$version.tar.gz tarName=FireflyIII-$version.tar.gz
# update composer (again)
composer update --no-dev --no-scripts --no-plugins
composer dump-autoload
# if this is a develop build, slightly different variable names. # if this is a develop build, slightly different variable names.
if [[ "develop" == "$version" ]]; then if [[ "develop" == "$version" ]]; then
#[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0; #[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
@@ -196,42 +192,48 @@ jobs:
tagFound=false tagFound=false
fi fi
done done
echo "Will use tag and release name $releaseName."
# set some variables
echo "Release name is $releaseName."
echo "Original name is $originalName."
echo "Zip name is $zipName."
echo "Tar name is $tarName."
# create a new branch to store the difference in. # create a new branch to store the difference in.
BRANCHNAME=release-$(date +'%s') BRANCH_NAME=release-$(date +'%s')
git checkout -b $BRANCHNAME git checkout -b $BRANCH_NAME
echo "Temporary branch name is '$BRANCH_NAME'."
# share variables with next step.
echo "releaseName=$releaseName" >> "$GITHUB_ENV"
echo "originalName=$originalName" >> "$GITHUB_ENV"
echo "zipName=$zipName" >> "$GITHUB_ENV"
echo "tarName=$tarName" >> "$GITHUB_ENV"
echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_ENV"
env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Commit all changes
run: |
# add all content, except output.txt (this contains the changelog and/or the download instructions) # add all content, except output.txt (this contains the changelog and/or the download instructions)
echo 'Add all and reset output.txt' echo 'Add all and reset output.txt'
git add -A git add -A
if test -f "output.txt"; then if test -f "output.txt"; then
echo 'output.txt exists, reset it.'
git reset output.txt git reset output.txt
fi fi
# push to a new branch. # push to a new branch.
echo "Auto commit on branch '$(git branch --show-current)'."
git commit -m "🤖 Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true git commit -m "🤖 Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
git push git push
env:
# zip and tar everything version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
echo 'Zip and tar...' - name: Describe new release
zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*" "*Procfile*" "*crowdin.yml*" "*sonar-project.properties*" run: |
touch $tarName
tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' --exclude='./Procfile' --exclude='../crowdin.yml' --exclude='./sonar-project.properties' -czf $tarName .
# add sha256 sum
echo 'Sha sum ...'
sha256sum -b $zipName > $zipName.sha256
sha256sum -b $tarName > $tarName.sha256
# add signatures:
gpg --armor --detach-sign $zipName
gpg --armor --detach-sign $tarName
# describe the development release. # describe the development release.
if [[ "develop" == "$version" ]]; then if [[ "develop" == "$version" ]]; then
echo 'Develop release.' echo 'Describe the latest develop release'
rm -f output.txt rm -f output.txt
touch output.txt touch output.txt
sudo chown -R runner:docker output.txt sudo chown -R runner:docker output.txt
@@ -246,7 +248,7 @@ jobs:
fi fi
# describe a branch release # describe a branch release
if [[ "$version" == branch* ]]; then if [[ "$version" == branch* ]]; then
echo 'Branch release.' echo 'Describe a branch release'
rm -f output.txt rm -f output.txt
touch output.txt touch output.txt
sudo chown -R runner:docker output.txt sudo chown -R runner:docker output.txt
@@ -261,7 +263,8 @@ jobs:
fi fi
# describe the main release # describe the main release
if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
echo 'Main release.' echo 'Describe the latest release'
touch output.txt
sudo chown -R runner:docker output.txt sudo chown -R runner:docker output.txt
echo '' >> output.txt echo '' >> output.txt
echo '### Instructions' >> output.txt echo '### Instructions' >> output.txt
@@ -274,7 +277,7 @@ jobs:
# describe alpha release # describe alpha release
if [[ "$version" == *alpha* ]]; then if [[ "$version" == *alpha* ]]; then
echo 'ALPHA release.' echo 'Describe an ALPHA release'
rm -f output.txt rm -f output.txt
touch output.txt touch output.txt
sudo chown -R runner:docker output.txt sudo chown -R runner:docker output.txt
@@ -292,7 +295,7 @@ jobs:
# describe beta release # describe beta release
if [[ "$version" == *beta* ]]; then if [[ "$version" == *beta* ]]; then
echo 'BETA release.' echo 'Describe a BETA release'
rm -f output.txt rm -f output.txt
touch output.txt touch output.txt
sudo chown -R runner:docker output.txt sudo chown -R runner:docker output.txt
@@ -307,14 +310,79 @@ jobs:
echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
fi fi
env:
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Merge all into working branch
run: |
MERGE_INTO=develop
if [[ "$version" == branch* ]]; then
MERGE_INTO=$version
fi
echo "Merge all changes from $BRANCH_NAME back into '$MERGE_INTO' using a PR"
PR_URL=$(gh pr create -B $MERGE_INTO -H $BRANCH_NAME --title "🤖 Automatic PR to merge all changes into the '$MERGE_INTO' branch." --body '🤖 Created by GitHub action')
echo "PR URL is '$PR_URL'"
IFS='/' read -ra parts <<< "$PR_URL"
PR_NR=$(printf %s\\n "${parts[@]:(-1)}")
echo "PR number is '$PR_NR'"
gh pr merge $PR_NR -b "🤖 Automatically merge the PR into the $MERGE_INTO branch." -d --merge
# pull the changes from the $MERGE_INTO branch.
git checkout $MERGE_INTO
git merge origin/$MERGE_INTO
git pull
git status
echo "Current branch '$(git branch --show-current)'."
if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
git checkout main
git merge origin/main
git pull
git status
echo "Also merge everything into main since this is a release."
echo 'create PR'
PR_URL=$(gh pr create -B main -H develop --title "🤖 Automatic PR to merge all changes into the main branch." --body "🤖 Created by GitHub action")
echo "PR URL is '$PR_URL'"
IFS='/' read -ra parts <<< "$PR_URL"
PR_NR=$(printf %s\\n "${parts[@]:(-1)}")
echo "PR number is '$PR_NR'"
echo 'Merge PR'
gh pr merge $PR_NR -b "🤖 Automatically merge the PR into the main branch." --merge
git checkout main
git merge origin/main
git pull
git status
echo "Current branch '$(git branch --show-current)'."
fi
echo "DONE!"
env:
GH_TOKEN: ${{ github.token }}
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Create archives
run: |
echo "Create zip file $zipName"
zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*" "*Procfile*" "*crowdin.yml*" "*sonar-project.properties*"
touch $tarName
echo "Create tar file $tarName"
tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' --exclude='./Procfile' --exclude='../crowdin.yml' --exclude='./sonar-project.properties' -czf $tarName .
# add sha256 sum
echo 'Sha sum ...'
sha256sum -b $zipName > $zipName.sha256
sha256sum -b $tarName > $tarName.sha256
# add signatures:
gpg --armor --detach-sign $zipName
gpg --armor --detach-sign $tarName
- name: Create release
run: |
# create a development release: # create a development release:
if [[ "develop" == "$version" ]]; then if [[ "develop" == "$version" ]]; then
# create PR and merge it right away into develop.
gh pr create -B develop -H $BRANCHNAME --title '🤖 Automatic PR to merge all changes into the develop branch.' --body '🤖 Created by GitHub action'
gh pr merge -b '🤖 Automatically merge the PR into the develop branch.' -d --rebase
# pull the changes from the develop branch. # pull the changes from the develop branch.
git checkout develop git checkout develop
git merge origin/develop git merge origin/develop
@@ -323,49 +391,44 @@ jobs:
# create the release: # create the release:
echo "Create develop release under tag '$releaseName'." echo "Create develop release under tag '$releaseName'."
git tag -a $releaseName -m "🤖 Development release '$version' on $(date +'%Y-%m-%d')" git tag -a $releaseName -m "🤖 Development release '$version' on $(date +'%Y-%m-%d')"
git push origin $releaseName git push origin $releaseName
gh release create $releaseName -p --verify-tag \ gh release create $releaseName -p --verify-tag \
-t "Development release for $(date +'%Y-%m-%d')" \ -t "Development release for $(date +'%Y-%m-%d')" \
--latest=false \ --latest=false \
-F output.txt -F output.txt
fi fi
# create a branch release: # create a branch release:
if [[ "$version" == branch* ]]; then if [[ "$version" == branch* ]]; then
# pull the changes from the branch-* branch.
git checkout $version
git merge origin/$version
git pull
# create the release: # create the release:
echo "Create branch release." echo "Create branch release."
git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')" git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')"
git push origin $releaseName git push origin $releaseName
gh release create $releaseName -p --verify-tag \ gh release create $releaseName -p --verify-tag \
-t "Branch release for $(date +'%Y-%m-%d')" \ -t "Branch release for $(date +'%Y-%m-%d')" \
--latest=false \ --latest=false \
-F output.txt -F output.txt
fi fi
# create a development (nightly) release: # Create a production release.
if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
# add zip file to release. git checkout main
gh release upload $releaseName $zipName git merge origin/main
gh release upload $releaseName $tarName git pull
git status
# add sha256 sum to release echo "Create prod release."
gh release upload $releaseName $zipName.sha256 git tag -a $releaseName -m "Release $version"
gh release upload $releaseName $tarName.sha256
# add signatures to release
gh release upload $releaseName $zipName.asc
gh release upload $releaseName $tarName.asc
# get current HEAD and add as file to the release
HEAD=$(git rev-parse HEAD)
echo $HEAD > HEAD.txt
gh release upload $releaseName HEAD.txt
else
echo 'MAIN (real) release'
git tag -a $releaseName -m "Here be changelog"
git push origin $releaseName git push origin $releaseName
# do not tag as latest when alpha or beta. # do not tag as latest when alpha or beta.
@@ -377,14 +440,19 @@ jobs:
# tag as latest when NOT alpha or beta. # tag as latest when NOT alpha or beta.
if [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then if [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
echo 'Mark prod as the latest.' echo 'Mark prod as the latest.'
gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag --latest=true
fi fi
fi
# add archive files to release env:
GH_TOKEN: ${{ github.token }}
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
- name: Upload artifacts
run: |
# add zip file to release.
gh release upload $releaseName $zipName gh release upload $releaseName $zipName
gh release upload $releaseName $tarName gh release upload $releaseName $tarName
# add sha256 sums to release # add sha256 sum to release
gh release upload $releaseName $zipName.sha256 gh release upload $releaseName $zipName.sha256
gh release upload $releaseName $tarName.sha256 gh release upload $releaseName $tarName.sha256
@@ -404,12 +472,6 @@ jobs:
rm -f $zipName.sha256 rm -f $zipName.sha256
rm -f $tarName rm -f $tarName
rm -f $tarName.sha256 rm -f $tarName.sha256
# merge main back into develop
git checkout develop
git merge main
git push
fi
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}
version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }} version: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}