-
-
Notifications
You must be signed in to change notification settings - Fork 2
Add Release pipeline #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,245 @@ | ||
name: release | ||
|
||
env: | ||
# The name of the project | ||
PROJECT_NAME: avrdude | ||
DIST_DIR: dist | ||
ARTIFACT_NAME: dist | ||
# The project's folder on Arduino's download server for uploading builds | ||
AWS_PLUGIN_TARGET: /tools/ | ||
|
||
on: | ||
push: | ||
tags: | ||
- "[0-9]+.[0-9]+*" | ||
|
||
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.0 | ||
credentials: | ||
username: ${{ github.actor }} | ||
password: ${{ secrets.AVRDUDE_CI_PAT }} | ||
|
||
steps: | ||
# the tag must be formatted this way <AVRDUDE_TAG>-arduino.<ARDUINO_VERSION>, e.g tag -> 7.0-arduino.1 | ||
- name: Set Avrdude tag name | ||
id: get_tag_name | ||
run: | | ||
TAG="${GITHUB_REF##*/}" | ||
echo ::set-output name=AVRDUDE_TAG::v${TAG%%-*} | ||
|
||
# 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 | ||
ref: ${{ steps.get_tag_name.outputs.AVRDUDE_TAG }} # pay attention, the pathches could not apply to newer version than 7.0 | ||
path: ${{ env.PROJECT_NAME }} | ||
|
||
- name: Apply patches | ||
working-directory: ${{ env.PROJECT_NAME }} | ||
run: git apply -v ../avrdude-packing/patches/*.patch | ||
|
||
- 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 -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 }}_* | ||
|
||
notarize-macos: | ||
runs-on: macos-latest | ||
needs: build | ||
|
||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v3 | ||
|
||
- name: Download artifacts | ||
uses: actions/download-artifact@v3 | ||
with: | ||
name: ${{ env.ARTIFACT_NAME }} | ||
path: ${{ env.DIST_DIR }} | ||
|
||
- name: Import Code-Signing Certificates | ||
env: | ||
KEYCHAIN: "sign.keychain" | ||
INSTALLER_CERT_MAC_PATH: "/tmp/ArduinoCerts2020.p12" | ||
KEYCHAIN_PASSWORD: keychainpassword # Arbitrary password for a keychain that exists only for the duration of the job, so not secret | ||
run: | | ||
echo "${{ secrets.INSTALLER_CERT_MAC_P12 }}" | base64 --decode > "${{ env.INSTALLER_CERT_MAC_PATH }}" | ||
security create-keychain -p "${{ env.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}" | ||
security default-keychain -s "${{ env.KEYCHAIN }}" | ||
security unlock-keychain -p "${{ env.KEYCHAIN_PASSWORD }}" "${{ env.KEYCHAIN }}" | ||
security import \ | ||
"${{ env.INSTALLER_CERT_MAC_PATH }}" \ | ||
-k "${{ env.KEYCHAIN }}" \ | ||
-f pkcs12 \ | ||
-A \ | ||
-T "/usr/bin/codesign" \ | ||
-P "${{ secrets.INSTALLER_CERT_MAC_PASSWORD }}" | ||
security set-key-partition-list \ | ||
-S apple-tool:,apple: \ | ||
-s \ | ||
-k "${{ env.KEYCHAIN_PASSWORD }}" \ | ||
"${{ env.KEYCHAIN }}" | ||
|
||
- name: Install gon for code signing and app notarization | ||
run: | | ||
wget -q https://github.com/mitchellh/gon/releases/download/v0.2.3/gon_macos.zip | ||
unzip gon_macos.zip -d /usr/local/bin | ||
|
||
- name: Sign and notarize binary | ||
env: | ||
AC_USERNAME: ${{ secrets.AC_USERNAME }} | ||
AC_PASSWORD: ${{ secrets.AC_PASSWORD }} | ||
run: | | ||
gon gon.config.hcl | ||
|
||
- name: Re-package binary | ||
# This step performs the following: | ||
# 1. Repackage the signed binary replaced in place by Gon (ignoring the output zip file) | ||
run: | | ||
# GitHub's upload/download-artifact actions don't preserve file permissions, | ||
# so we need to add execution permission back until the action is made to do this. | ||
chmod +x ${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_macOS_64bit/bin/${{ env.PROJECT_NAME }} | ||
TAG="${GITHUB_REF/refs\/tags\//}" | ||
tar -czvf "${{ env.DIST_DIR }}/${{ env.PROJECT_NAME }}_${TAG}_macOS_64bit.tar.gz" \ | ||
-C ${{ env.DIST_DIR }}/ ${{ env.PROJECT_NAME }}_macOS_64bit/ | ||
|
||
- name: Upload artifacts | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
if-no-files-found: error | ||
name: ${{ env.ARTIFACT_NAME }} | ||
path: ${{ env.DIST_DIR }} | ||
|
||
create-release: | ||
runs-on: | ||
ubuntu-latest | ||
needs: [build, notarize-macos] | ||
|
||
steps: | ||
- name: Checkout repository # we need package_index.template | ||
uses: actions/checkout@v3 | ||
|
||
- name: Download artifact | ||
uses: actions/download-artifact@v3 | ||
with: | ||
name: ${{ env.ARTIFACT_NAME }} | ||
path: ${{ env.DIST_DIR }} | ||
|
||
- name: Identify Prerelease | ||
# This is a workaround while waiting for create-release action | ||
# to implement auto pre-release based on tag | ||
id: prerelease | ||
run: | | ||
wget -q -P /tmp https://github.com/fsaintjacques/semver-tool/archive/3.2.0.zip | ||
unzip -p /tmp/3.2.0.zip semver-tool-3.2.0/src/semver >/tmp/semver && chmod +x /tmp/semver | ||
if [[ "$(/tmp/semver get prerel "${GITHUB_REF/refs\/tags\//}")" ]]; then echo "::set-output name=IS_PRE::true"; fi | ||
|
||
- name: Generate package index entry | ||
run: | | ||
TAG=${GITHUB_REF/refs\/tags\//} | ||
package_index=`cat package_index.template | sed s/%%VERSION%%/${TAG}/` | ||
declare -a target_folders=("Windows_32bit" "Linux_64bit" "macOS_64bit" "Linux_32bit" "Linux_ARMv6" "Linux_ARM64") | ||
cd dist | ||
for folder in "${target_folders[@]}" | ||
do | ||
ARCHIVE_NAME=${{ env.PROJECT_NAME }}_${TAG}_${folder}.tar.gz | ||
T_OS=`echo ${folder} | awk '{print toupper($0)}'` | ||
SHASUM=`sha256sum ${ARCHIVE_NAME} | cut -f1 -d" "` | ||
SIZE=`stat --printf="%s" ${ARCHIVE_NAME}` | ||
package_index=`echo "$package_index" | | ||
sed s/%%FILENAME_${T_OS}%%/${ARCHIVE_NAME}/ | | ||
sed s/%%FILENAME_${T_OS}%%/${ARCHIVE_NAME}/ | | ||
sed s/%%SIZE_${T_OS}%%/${SIZE}/ | | ||
sed s/%%SHA_${T_OS}%%/${SHASUM}/` | ||
done | ||
cd .. | ||
echo ================== CUT ME HERE ===================== | ||
echo "${package_index}" | ||
echo "${package_index}" > package_index_draft.json | ||
|
||
- name: Create Github Release and upload artifacts | ||
uses: ncipollo/release-action@v1 | ||
with: | ||
token: ${{ secrets.GITHUB_TOKEN }} | ||
draft: false | ||
prerelease: ${{ steps.prerelease.outputs.IS_PRE }} | ||
# NOTE: "Artifact is a directory" warnings are expected and don't indicate a problem | ||
# (all the files we need are in the DIST_DIR root) | ||
artifacts: "${{ env.DIST_DIR }}/*,package_index_draft.json" | ||
|
||
- name: Upload release files on Arduino downloads servers | ||
uses: docker://plugins/s3 | ||
env: | ||
PLUGIN_SOURCE: "${{ env.DIST_DIR }}/*" | ||
PLUGIN_TARGET: ${{ env.AWS_PLUGIN_TARGET }} | ||
PLUGIN_STRIP_PREFIX: "${{ env.DIST_DIR }}/" | ||
PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }} | ||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/general/gon.config.hcl | ||
# See: https://github.com/mitchellh/gon#configuration-file | ||
source = ["dist/avrdude_macOS_64bit/bin/avrdude"] | ||
bundle_id = "cc.arduino.avrdude" | ||
|
||
sign { | ||
application_identity = "Developer ID Application: ARDUINO SA (7KT7ZWMCJT)" | ||
} | ||
|
||
# Ask Gon for zip output to force notarization process to take place. | ||
# The CI will ignore the zip output, using the signed binary only. | ||
zip { | ||
output_path = "unused.zip" | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{ | ||
"name": "avrdude", | ||
"version": "%%VERSION%%", | ||
"systems": [ | ||
{ | ||
"host": "x86_64-apple-darwin12", | ||
"url": "https://downloads.arduino.cc/tools/%%FILENAME_MACOS_64BIT%%", | ||
"archiveFileName": "%%FILENAME_MACOS_64BIT%%", | ||
"size": "%%SIZE_MACOS_64BIT%%", | ||
"checksum": "SHA-256:%%SHA_MACOS_64BIT%%" | ||
}, | ||
{ | ||
"host": "arm-linux-gnueabihf", | ||
"url": "https://downloads.arduino.cc/tools/%%FILENAME_LINUX_ARMV6%%", | ||
"archiveFileName": "%%FILENAME_LINUX_ARMV6%%", | ||
"size": "%%SIZE_LINUX_ARMV6%%", | ||
"checksum": "SHA-256:%%SHA_LINUX_ARMV6%%" | ||
}, | ||
{ | ||
"host": "aarch64-linux-gnu", | ||
"url": "https://downloads.arduino.cc/tools/%%FILENAME_LINUX_ARM64%%", | ||
"archiveFileName": "%%FILENAME_LINUX_ARM64%%", | ||
"size": "%%SIZE_LINUX_ARM64%%", | ||
"checksum": "SHA-256:%%SHA_LINUX_ARM64%%" | ||
}, | ||
{ | ||
"host": "x86_64-linux-gnu", | ||
"url": "https://downloads.arduino.cc/tools/%%FILENAME_LINUX_64BIT%%", | ||
"archiveFileName": "%%FILENAME_LINUX_64BIT%%", | ||
"size": "%%SIZE_LINUX_64BIT%%", | ||
"checksum": "SHA-256:%%SHA_LINUX_64BIT%%" | ||
}, | ||
{ | ||
"host": "i686-linux-gnu", | ||
"url": "https://downloads.arduino.cc/tools/%%FILENAME_LINUX_32BIT%%", | ||
"archiveFileName": "%%FILENAME_LINUX_32BIT%%", | ||
"size": "%%SIZE_LINUX_32BIT%%", | ||
"checksum": "SHA-256:%%SHA_LINUX_32BIT%%" | ||
}, | ||
{ | ||
"host": "i686-mingw32", | ||
"url": "https://downloads.arduino.cc/tools/%%FILENAME_WINDOWS_32BIT%%", | ||
"archiveFileName": "%%FILENAME_WINDOWS_32BIT%%", | ||
"size": "%%SIZE_WINDOWS_32BIT%%", | ||
"checksum": "SHA-256:%%SHA_WINDOWS_32BIT%%" | ||
} | ||
] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 51d4f690af8c27cebef3d52e79e008ae0ad5a6ab Mon Sep 17 00:00:00 2001 | ||
From: Umberto Baldi <[email protected]> | ||
Date: Tue, 3 May 2022 16:14:56 +0200 | ||
Subject: [PATCH] Added fake EFUSE to atmega8 part. This allows to have a | ||
common platform.txt recipe for all the ATMegaXX parts in the Arduino IDE. | ||
|
||
See: | ||
https://github.com/arduino/Arduino/issues/2075#issuecomment-238031689 | ||
https://github.com/arduino/Arduino/issues/2075 | ||
|
||
|
||
Co-authored-by: Martino Facchin <[email protected]> | ||
--- | ||
src/avrdude.conf.in | 7 +++++++ | ||
1 file changed, 7 insertions(+) | ||
|
||
diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in | ||
index 362b616..4008218 100644 | ||
--- a/src/avrdude.conf.in | ||
+++ b/src/avrdude.conf.in | ||
@@ -6525,6 +6525,13 @@ part | ||
"x x x x x x x x i i i i i i i i"; | ||
; | ||
|
||
+ # Required for Arduino IDE | ||
+ # see: https://github.com/arduino/Arduino/issues/2075 | ||
+ # https://github.com/arduino/Arduino/issues/2075#issuecomment-238031689 | ||
+ memory "efuse" | ||
+ size = 0; | ||
+ ; | ||
+ | ||
memory "lock" | ||
size = 1; | ||
min_write_delay = 2000; | ||
-- | ||
2.17.1 | ||
|
28 changes: 28 additions & 0 deletions
28
patches/0002-Try-to-run-ChipErase-on-UDPI-even-if-return-code-is--67.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From b5847ba97418d6b436c62b9d96f5a0be30280474 Mon Sep 17 00:00:00 2001 | ||
From: Umberto Baldi <[email protected]> | ||
Date: Tue, 3 May 2022 16:16:39 +0200 | ||
Subject: [PATCH] Try to run ChipErase on UPDI even if return code is -67 More | ||
details in | ||
https://github.com/arduino/ArduinoCore-megaavr/issues/33#issuecomment-495613256 | ||
|
||
Co-authored-by: Martino Facchin <[email protected]> | ||
--- | ||
src/main.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/main.c b/src/main.c | ||
index 253c6e5..27c7743 100644 | ||
--- a/src/main.c | ||
+++ b/src/main.c | ||
@@ -1118,7 +1118,7 @@ int main(int argc, char * argv []) | ||
rc = avr_signature(pgm, p); | ||
if (rc != 0) { | ||
// -68 == -(0x44) == -(RSP3_FAIL_OCD_LOCKED) | ||
- if ((rc == -68) && (p->flags & AVRPART_HAS_UPDI) && (attempt < 1)) { | ||
+ if ((rc == -68 || rc == -67) && (p->flags & AVRPART_HAS_UPDI) && (attempt < 1)) { | ||
attempt++; | ||
if (pgm->read_sib) { | ||
// Read SIB and compare FamilyID | ||
-- | ||
2.17.1 | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.