File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 6262 - ${{ github.workspace }}:/src
6363 steps :
6464 - name : Check out the repo
65- uses : actions/checkout@v4
65+ uses : actions/checkout@v6
6666 with :
6767 submodules : recursive
6868 # fetch-depth: 0 # https://github.com/actions/checkout#Fetch-all-history-for-all-tags-and-branches
@@ -114,7 +114,7 @@ jobs:
114114 - ${{ github.workspace }}:/src
115115 steps :
116116 - name : Check out the repo
117- uses : actions/checkout@v4
117+ uses : actions/checkout@v6
118118 with :
119119 submodules : recursive
120120
Original file line number Diff line number Diff line change 2121
2222 steps :
2323 - name : Check out the repo
24- uses : actions/checkout@v4
24+ uses : actions/checkout@v6
2525 with :
2626 submodules : recursive
2727
4040 run : |
4141 # Create logs directory if it doesn't exist
4242 mkdir -p logs
43-
43+
4444 # Copy all build logs from the build directory
4545 if [ -d "build" ]; then
4646 find build -name "*.log" -type f -exec cp {} logs/ \; 2>/dev/null || true
Original file line number Diff line number Diff line change 2222 xcode-version : ' 16.0'
2323
2424 - name : Check out the repo
25- uses : actions/checkout@v4
25+ uses : actions/checkout@v6
2626 with :
2727 submodules : recursive
2828
6868 run : |
6969 # Create logs directory if it doesn't exist
7070 mkdir -p logs
71-
71+
7272 # Copy all build logs from the build directory
7373 if [ -d "build" ]; then
7474 find build -name "*.log" -type f -exec cp {} logs/ \; 2>/dev/null || true
Original file line number Diff line number Diff line change 4545 - ${{ github.workspace }}:/src
4646 steps :
4747 - name : Check out the repo
48- uses : actions/checkout@v4
48+ uses : actions/checkout@v6
4949 with :
5050 submodules : recursive
5151
7676 contents : write
7777 steps :
7878 - name : Check out the repo
79- uses : actions/checkout@v4
79+ uses : actions/checkout@v6
8080 with :
8181 fetch-depth : 0 # Need full history for changelog
8282
Original file line number Diff line number Diff line change 1919 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
2020 steps :
2121 - name : Check out the repo
22- uses : actions/checkout@v4
22+ uses : actions/checkout@v6
2323 with :
2424 ref : ${{ inputs.tag }}
2525 fetch-depth : 0
Original file line number Diff line number Diff line change @@ -10,41 +10,41 @@ jobs:
1010 runs-on : ubuntu-latest
1111 steps :
1212 - name : Checkout
13- uses : actions/checkout@v4
13+ uses : actions/checkout@v6
1414 with :
1515 fetch-depth : 0
1616 token : ${{ secrets.SYNC_PAT }}
17-
17+
1818 - name : Configure git
1919 run : |
2020 git config user.name "EdgeTX Sync Bot"
2121 git config user.email "sync-bot@edgetx.org"
22-
22+
2323 - name : Sync branches from upstream (hard reset)
2424 env :
2525 BRANCHES : " main 2.11" # Add/modify branches here as needed
2626 run : |
2727 git remote add upstream https://github.com/EdgeTX/edgetx.git
2828 git fetch upstream
29-
29+
3030 for branch in $BRANCHES; do
3131 echo "=== Syncing branch: $branch ==="
32-
32+
3333 # Check if upstream has this branch
3434 if ! git ls-remote --heads upstream | grep -q "refs/heads/$branch"; then
3535 echo "⚠️ Branch $branch does not exist in upstream, skipping..."
3636 continue
3737 fi
38-
38+
3939 # Hard reset to upstream (creates exact copy with same SHA)
4040 git checkout -B $branch upstream/$branch
41-
41+
4242 # Force push to origin
4343 git push origin $branch --force
44-
44+
4545 echo "✓ Branch $branch synced (SHA: $(git rev-parse HEAD))"
4646 done
47-
47+
4848 echo ""
4949 echo "=== Sync Complete ==="
5050 echo "All specified branches are now exact copies of upstream"
Original file line number Diff line number Diff line change 2626
2727 steps :
2828 - name : Check out the repo
29- uses : actions/checkout@v4
29+ uses : actions/checkout@v6
3030 with :
3131 submodules : recursive
3232
7070 run : |
7171 # Create logs directory if it doesn't exist
7272 mkdir -p logs
73-
73+
7474 # Copy all build logs from the build directory
7575 if [ -d "build" ]; then
7676 find build -name "*.log" -type f -exec cp {} logs/ \; 2>/dev/null || true
You can’t perform that action at this time.
0 commit comments