Merge main branch

This commit is contained in:
Marius Greuel
2023-01-09 19:27:38 +01:00
129 changed files with 38204 additions and 25585 deletions

View File

@@ -34,9 +34,11 @@ jobs:
linux-x86_64:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install prerequisites
run: >-
sudo apt-get update
sudo apt-get install -y
build-essential
cmake
@@ -47,9 +49,14 @@ jobs:
libusb-1.0-0-dev
libhidapi-dev
libftdi1-dev
libreadline-dev
texinfo
texlive
texi2html
- name: Configure
run: >-
cmake
-D BUILD_DOC=1
-D DEBUG_CMAKE=1
-D HAVE_LINUXGPIO=1
-D HAVE_LINUXSPI=1
@@ -59,7 +66,7 @@ jobs:
run: cmake --build build
- name: Archive build artifacts
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build-linux-x86_64
path: |
@@ -67,7 +74,7 @@ jobs:
!**/*.d
!**/*.o
- name: Archive executables
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: avrdude-linux-x86_64
path: |
@@ -84,13 +91,15 @@ jobs:
- { arch: armhf, processor: armhf, prefix: arm-linux-gnueabihf, inc-lib: arm-linux-gnueabihf }
- { arch: arm64, processor: aarch64, prefix: aarch64-linux-gnu, inc-lib: aarch64-linux-gnu }
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Add architecture
run: |
dpkg --add-architecture ${{matrix.arch}}
apt-get update
- name: Install prerequisites
run: >-
apt-get update
apt-get install -y
git
cmake
@@ -102,6 +111,7 @@ jobs:
libusb-1.0-0-dev:${{matrix.arch}}
libhidapi-dev:${{matrix.arch}}
libftdi1-dev:${{matrix.arch}}
libreadline-dev:${{matrix.arch}}
- name: Configure
run: >-
cmake
@@ -120,7 +130,7 @@ jobs:
run: cmake --build build
- name: Archive build artifacts
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build-linux-${{matrix.processor}}
path: |
@@ -128,7 +138,7 @@ jobs:
!**/*.d
!**/*.o
- name: Archive executables
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: avrdude-linux-${{matrix.processor}}
path: |
@@ -138,9 +148,11 @@ jobs:
macos-x86_64:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install prerequisites
run: >-
# brew update
brew install
cmake
flex
@@ -149,6 +161,7 @@ jobs:
libusb
hidapi
libftdi
readline
- name: Configure
run: >-
cmake
@@ -161,7 +174,7 @@ jobs:
run: cmake --build build
- name: Archive build artifacts
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build-macos-x86_64
path: |
@@ -169,7 +182,7 @@ jobs:
!**/*.d
!**/*.o
- name: Archive executables
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: avrdude-macos-x86_64
path: |
@@ -185,7 +198,7 @@ jobs:
- { arch: x64, platform: x64 }
- { arch: arm64, platform: ARM64 }
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install prerequisites
# As Chocolatey is notoriously unreliable, install winflexbison3 directly from GitHub.
# run: choco install winflexbison3
@@ -202,14 +215,15 @@ jobs:
-D CMAKE_C_FLAGS_RELWITHDEBINFO="/MT /GL /Zi /O2 /Ob1 /DNDEBUG"
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /GL /Zi /O2 /Ob1 /DNDEBUG"
-D CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="/DEBUG /INCREMENTAL:NO /LTCG /OPT:REF /OPT:ICF"
-D HAVE_LIBREADLINE=HAVE_LIBREADLINE-NOTFOUND
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-D USE_EXTERNAL=1
-D USE_EXTERNAL_LIBS=1
-B build
- name: Build
run: cmake --build build --config ${{env.BUILD_TYPE}}
- name: Archive build artifacts
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build-msvc-${{matrix.arch}}
path: |
@@ -221,7 +235,7 @@ jobs:
mv build/src/RelWithDebInfo/avrdude.exe build/src
mv build/src/RelWithDebInfo/avrdude.pdb build/src
- name: Archive executables
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: avrdude-msvc-${{matrix.arch}}
path: |
@@ -240,7 +254,7 @@ jobs:
- { sys: mingw32, env: i686 }
- { sys: mingw64, env: x86_64 }
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: msys2/setup-msys2@v2
with:
msystem: ${{matrix.sys}}
@@ -265,13 +279,13 @@ jobs:
run: cmake --build build
- name: Archive build artifacts
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: build-mingw-${{matrix.env}}
path: |
build/
- name: Archive executables
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: avrdude-mingw-${{matrix.env}}
path: |

View File

@@ -76,10 +76,3 @@ jobs:
asset_path: ./asset.zip
asset_name: avrdude-${{github.ref_name}}-windows-${{matrix.arch}}.zip
asset_content_type: application/zip
#deploy:
# needs: [asset-msvc]
# runs-on: ubuntu-latest
# steps:
# - name: Create package (Chocolatey)
# run: echo TODO