mirror of
https://github.com/MoreTore/openpilot.git
synced 2026-08-05 08:16:06 +08:00
September 2024 Update
This commit is contained in:
@@ -0,0 +1,59 @@
|
||||
name: Update MAKE-PRS-HERE
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- FrogPilot-Staging
|
||||
|
||||
env:
|
||||
SOURCE_BRANCH: FrogPilot-Staging
|
||||
TARGET_BRANCH: MAKE-PRS-HERE
|
||||
|
||||
jobs:
|
||||
squash-and-cherry-pick:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ env.SOURCE_BRANCH }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set Git user name and email
|
||||
run: |
|
||||
git config --global user.name "${{ github.actor }}"
|
||||
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
|
||||
|
||||
- name: Get the second to last commit hash and create a temporary branch
|
||||
run: |
|
||||
commit_hash=$(git rev-parse HEAD~1)
|
||||
git checkout -b temp-branch $commit_hash
|
||||
|
||||
- name: Squash all commits into one with today's date in Phoenix time zone
|
||||
run: |
|
||||
day=$(TZ='America/Phoenix' date '+%-d')
|
||||
suffix="th"
|
||||
case $day in
|
||||
1|21|31) suffix="st" ;;
|
||||
2|22) suffix="nd" ;;
|
||||
3|23) suffix="rd" ;;
|
||||
esac
|
||||
commit_message="$(TZ='America/Phoenix' date '+%B ')$day$suffix, $(TZ='America/Phoenix' date '+%Y') Update"
|
||||
git reset --soft $(git rev-list --max-parents=0 HEAD)
|
||||
git commit -m "$commit_message"
|
||||
|
||||
- name: Cherry-pick the squashed commit to target branch and push
|
||||
run: |
|
||||
git fetch origin
|
||||
git checkout ${{ env.TARGET_BRANCH }}
|
||||
git cherry-pick temp-branch -X theirs || {
|
||||
if git status | grep -q "nothing to commit, working tree clean"; then
|
||||
echo "Empty commit detected, skipping cherry-pick."
|
||||
git cherry-pick --skip
|
||||
else
|
||||
echo "Continuing with cherry-pick."
|
||||
git cherry-pick --continue
|
||||
fi
|
||||
}
|
||||
git push origin ${{ env.TARGET_BRANCH }}
|
||||
@@ -0,0 +1,21 @@
|
||||
name: Update FrogPilot-Previous Branch
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 7 1 * *'
|
||||
|
||||
jobs:
|
||||
update-branch:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Reset "FrogPilot-Previous" branch to match "FrogPilot"
|
||||
run: |
|
||||
git fetch origin
|
||||
git checkout FrogPilot-Previous || git checkout -b FrogPilot-Previous
|
||||
git reset --hard origin/FrogPilot
|
||||
git push origin FrogPilot-Previous --force
|
||||
@@ -0,0 +1,21 @@
|
||||
name: Update FrogPilot Branch
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 19 1 * *'
|
||||
|
||||
jobs:
|
||||
update-branch:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Reset "FrogPilot" branch to match "FrogPilot-Staging"
|
||||
run: |
|
||||
git fetch origin
|
||||
git checkout FrogPilot || git checkout -b FrogPilot
|
||||
git reset --hard origin/FrogPilot-Staging
|
||||
git push origin FrogPilot --force
|
||||
Reference in New Issue
Block a user