From 1c5926f524a7be64807e378477ec42084ed2ae98 Mon Sep 17 00:00:00 2001
From: mcuee <xiaofanc@gmail.com>
Date: Sat, 28 Oct 2023 13:07:02 +0800
Subject: [PATCH 1/4] Add arduino_packing github action for git main

---
 .github/workflows/arduino_packing.yml | 94 +++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 .github/workflows/arduino_packing.yml

diff --git a/.github/workflows/arduino_packing.yml b/.github/workflows/arduino_packing.yml
new file mode 100644
index 000000000..9d6c5f5d5
--- /dev/null
+++ b/.github/workflows/arduino_packing.yml
@@ -0,0 +1,94 @@
+name: release
+
+env:
+  # The name of the project
+  PROJECT_NAME: avrdude
+  DIST_DIR: dist
+  ARTIFACT_NAME: dist
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    name: build (${{ matrix.config.os }}, ${{ matrix.config.arch }})
+    runs-on:
+      ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          - os: Linux
+            arch: 64bit
+            cross_compile: x86_64-ubuntu16.04-linux-gnu
+          - os: Linux
+            arch: 32bit
+            cross_compile: i686-ubuntu16.04-linux-gnu
+          - os: Linux
+            arch: ARMv6
+            cross_compile: arm-linux-gnueabihf
+          - os: Linux
+            arch: ARM64
+            cross_compile: aarch64-linux-gnu
+          - os: macOS
+            arch: 64bit
+            cross_compile: x86_64-apple-darwin13
+            cross_compiler: o64-clang
+            ar: /opt/osxcross/target/bin/x86_64-apple-darwin13-ar # we have to manually specify the full path otherwise it's not found for some reason
+            ld: /opt/osxcross/target/bin/x86_64-apple-darwin13-ld
+          - os: Windows
+            arch: 32bit
+            cross_compile: i686-w64-mingw32
+            extension: .exe
+            
+    container:
+      image: ghcr.io/arduino/crossbuild:0.2.2
+    
+    steps:
+    
+    # this repo should contain only the patches that could not be upstreamed and the release CI nothing else
+    - name: Checkout avrdude-packing repository
+      uses: actions/checkout@v3
+      with:
+        path: avrdude-packing
+
+    - name: Checkout avrdude repository
+      uses: actions/checkout@v3
+      with:
+        repository: avrdudes/avrdude
+        path: ${{ env.PROJECT_NAME }}
+
+    - name: replace system ranlib with darwin one
+      # for some reason is not possible to override ranlib with env vars, so this is ugly but it's the only way I found
+      if: matrix.config.os == 'macOS'
+      run: |
+        mv /usr/bin/ranlib /usr/bin/ranlib.bk
+        ln -s /opt/osxcross/target/bin/${{ matrix.config.cross_compile }}-ranlib /usr/bin/ranlib
+
+    - name: Build Avrdude
+      working-directory: ${{ env.PROJECT_NAME }}
+      run: |
+        if [ "${{ matrix.config.os }}" = "macOS" ]; then
+          # For darwin we disable the static flags (not supported by clang) and we make some adjustments
+          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cross_compiler }} -DCMAKE_CXX_COMPILER=${{ matrix.config.cross_compiler }}++ -DCMAKE_AR=${{ matrix.config.ar }} -DCMAKE_LINKER=${{ matrix.config.ld}} -DCMAKE_EXE_LINKER_FLAGS="-L/opt/lib/${{ matrix.config.cross_compile }}/lib/" -DCMAKE_C_FLAGS="-I/opt/lib/${{ matrix.config.cross_compile }}/include -pthread -framework Foundation -framework IOKit -framework Cocoa -framework Security -DHAVE_USB_H" -DCMAKE_PREFIX_PATH=/opt/lib/${{ matrix.config.cross_compile }}/ -DHAVE_LIBFTDI="NO" -B build/
+        else
+          cmake -DCMAKE_C_COMPILER=${{ matrix.config.cross_compile }}-gcc -DCMAKE_CXX_COMPILER=${{ matrix.config.cross_compile }}-g++ -DCMAKE_EXE_LINKER_FLAGS="-static-libgcc -static-libstdc++" -DCMAKE_C_FLAGS="-I/opt/lib/${{ matrix.config.cross_compile }}/include/libusb-1.0/ -I/opt/lib/${{ matrix.config.cross_compile }}/include -pthread" -DCMAKE_PREFIX_PATH=/opt/lib/${{ matrix.config.cross_compile }}/ -DHAVE_LIBFTDI="NO" -B build/
+        fi
+        cmake --build build/ -v
+
+    - name: Package
+      working-directory: ${{ env.PROJECT_NAME }}
+      run: | # we need to create the subdir where to place binaries
+        mkdir -p ${{ env.PROJECT_NAME }}_${{ matrix.config.os }}_${{ matrix.config.arch }}/bin ${{ env.PROJECT_NAME }}_${{ matrix.config.os }}_${{ matrix.config.arch }}/etc
+        chmod +x build/src/${{ env.PROJECT_NAME }}${{ matrix.config.extension }}
+        mv -v build/src/${{ env.PROJECT_NAME }}${{ matrix.config.extension }} ${{ env.PROJECT_NAME }}_${{ matrix.config.os }}_${{ matrix.config.arch }}/bin
+        mv -v build/src/${{ env.PROJECT_NAME }}.conf ${{ env.PROJECT_NAME }}_${{ matrix.config.os }}_${{ matrix.config.arch }}/etc
+        mv -v COPYING ${{ env.PROJECT_NAME }}_${{ matrix.config.os }}_${{ matrix.config.arch }}/LICENSE.txt
+        tar -czv ${{ env.PROJECT_NAME }}_${{ matrix.config.os }}_${{ matrix.config.arch }} -f ${{ env.PROJECT_NAME }}_${GITHUB_REF##*/}_${{ matrix.config.os }}_${{ matrix.config.arch }}.tar.gz
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        if-no-files-found: error
+        name: ${{ env.ARTIFACT_NAME }}
+        path: ${{ env.PROJECT_NAME }}/${{ env.PROJECT_NAME }}_*

From 90decdc22346cb1347ceef1c21e8baaf72ff99e8 Mon Sep 17 00:00:00 2001
From: mcuee <xiaofanc@gmail.com>
Date: Sat, 28 Oct 2023 13:40:25 +0800
Subject: [PATCH 2/4] Not to run upon pull-request

1) Change the name of the script
2) Not to run for pull-request, only run when push to git main
---
 .github/workflows/arduino_packing.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/arduino_packing.yml b/.github/workflows/arduino_packing.yml
index 9d6c5f5d5..39be5ce51 100644
--- a/.github/workflows/arduino_packing.yml
+++ b/.github/workflows/arduino_packing.yml
@@ -1,4 +1,4 @@
-name: release
+name: avrdude_packing
 
 env:
   # The name of the project
@@ -8,7 +8,6 @@ env:
 
 on:
   push:
-  pull_request:
 
 jobs:
   build:

From b568611a91c34b61ca489d9ae2a7caa8bfd2e6f9 Mon Sep 17 00:00:00 2001
From: mcuee <xiaofanc@gmail.com>
Date: Mon, 30 Oct 2023 19:57:09 +0800
Subject: [PATCH 3/4] Patches are no longer necessary.

Co-authored-by: Umberto Baldi <34278123+umbynos@users.noreply.github.com>
---
 .github/workflows/arduino_packing.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/arduino_packing.yml b/.github/workflows/arduino_packing.yml
index 39be5ce51..bef149538 100644
--- a/.github/workflows/arduino_packing.yml
+++ b/.github/workflows/arduino_packing.yml
@@ -44,12 +44,6 @@ jobs:
       image: ghcr.io/arduino/crossbuild:0.2.2
     
     steps:
-    
-    # this repo should contain only the patches that could not be upstreamed and the release CI nothing else
-    - name: Checkout avrdude-packing repository
-      uses: actions/checkout@v3
-      with:
-        path: avrdude-packing
 
     - name: Checkout avrdude repository
       uses: actions/checkout@v3

From aef97f1937a0881d04917a18b6b0fa2dae4d323e Mon Sep 17 00:00:00 2001
From: mcuee <xiaofanc@gmail.com>
Date: Mon, 30 Oct 2023 20:01:05 +0800
Subject: [PATCH 4/4] Specify main branch for the action

Reference:
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
---
 .github/workflows/arduino_packing.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/arduino_packing.yml b/.github/workflows/arduino_packing.yml
index bef149538..c266e0cad 100644
--- a/.github/workflows/arduino_packing.yml
+++ b/.github/workflows/arduino_packing.yml
@@ -7,7 +7,12 @@ env:
   ARTIFACT_NAME: dist
 
 on:
+  label:
+    types:
+      - created
   push:
+    branches:
+      - main
 
 jobs:
   build: