feat: update version to 1.2.14 and refactor release workflows for improved GitHub and Gitea support
This commit is contained in:
parent
58549a53e4
commit
04f557939d
12
.github/workflows/providers/github-release.yml
vendored
12
.github/workflows/providers/github-release.yml
vendored
@ -11,15 +11,11 @@ on:
|
|||||||
type: string
|
type: string
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write # Required for creating releases
|
contents: write
|
||||||
issues: read # Required for reading changelog
|
|
||||||
pull-requests: read # Required for reading changelog
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
|
||||||
contents: write # Required for creating releases at job level
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
@ -35,8 +31,8 @@ jobs:
|
|||||||
|
|
||||||
- name: Build Firmware
|
- name: Build Firmware
|
||||||
run: |
|
run: |
|
||||||
pio run -t buildfs # Build SPIFFS
|
pio run -t buildfs
|
||||||
pio run # Build firmware
|
pio run
|
||||||
|
|
||||||
- name: Merge firmware and SPIFFS
|
- name: Merge firmware and SPIFFS
|
||||||
run: |
|
run: |
|
||||||
@ -53,7 +49,7 @@ jobs:
|
|||||||
- name: Prepare OTA firmware
|
- name: Prepare OTA firmware
|
||||||
run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create GitHub Release
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
|
121
.github/workflows/release.yml
vendored
121
.github/workflows/release.yml
vendored
@ -6,16 +6,14 @@ on:
|
|||||||
- 'v*'
|
- 'v*'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
get-version-and-changelog:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.get_version.outputs.VERSION }}
|
||||||
|
changelog: ${{ steps.changelog.outputs.CHANGES }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Get version from tag
|
- name: Get version from tag
|
||||||
id: get_version
|
id: get_version
|
||||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
||||||
@ -38,99 +36,20 @@ jobs:
|
|||||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Install dependencies
|
github-release:
|
||||||
run: |
|
needs: get-version-and-changelog
|
||||||
python -m pip install --upgrade pip
|
if: github.server_url == 'https://github.com'
|
||||||
pip install --upgrade platformio esptool
|
uses: ./.github/workflows/providers/github-release.yml
|
||||||
sudo apt-get update
|
with:
|
||||||
sudo apt-get install -y jq gh
|
version: ${{ needs.get-version-and-changelog.outputs.version }}
|
||||||
|
changelog: ${{ needs.get-version-and-changelog.outputs.changelog }}
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
- name: Build Firmware
|
gitea-release:
|
||||||
run: |
|
needs: get-version-and-changelog
|
||||||
pio run -t buildfs
|
if: github.server_url != 'https://github.com'
|
||||||
pio run
|
uses: ./.github/workflows/providers/gitea-release.yml
|
||||||
|
with:
|
||||||
- name: Merge firmware and SPIFFS
|
version: ${{ needs.get-version-and-changelog.outputs.version }}
|
||||||
run: |
|
changelog: ${{ needs.get-version-and-changelog.outputs.changelog }}
|
||||||
esptool.py --chip esp32 merge_bin \
|
secrets: inherit
|
||||||
--flash_mode dio \
|
|
||||||
--flash_freq 40m \
|
|
||||||
--flash_size 4MB \
|
|
||||||
-o .pio/build/esp32dev/filaman_full.bin \
|
|
||||||
0x1000 .pio/build/esp32dev/bootloader.bin \
|
|
||||||
0x8000 .pio/build/esp32dev/partitions.bin \
|
|
||||||
0x10000 .pio/build/esp32dev/firmware.bin \
|
|
||||||
0x290000 .pio/build/esp32dev/spiffs.bin
|
|
||||||
|
|
||||||
- name: Prepare OTA firmware
|
|
||||||
run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
|
||||||
|
|
||||||
- name: Create GitHub Release
|
|
||||||
if: github.server_url == 'https://github.com'
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
run: |
|
|
||||||
gh release create "${{ github.ref_name }}" \
|
|
||||||
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
|
||||||
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
|
||||||
".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
|
|
||||||
".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
|
|
||||||
|
|
||||||
- name: Create Gitea Release
|
|
||||||
if: github.server_url != 'https://github.com'
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
|
||||||
GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
|
|
||||||
run: |
|
|
||||||
# Validate and sanitize API URL
|
|
||||||
if [[ ! "$GITEA_API_URL" =~ ^https?:// ]]; then
|
|
||||||
echo "Error: GITEA_API_URL must start with http:// or https://"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove trailing slash and ensure /api/v1
|
|
||||||
GITEA_API_URL="${GITEA_API_URL%/}"
|
|
||||||
if [[ ! "$GITEA_API_URL" =~ /api/v1$ ]]; then
|
|
||||||
GITEA_API_URL="${GITEA_API_URL}/api/v1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Creating Gitea release..."
|
|
||||||
RESPONSE=$(curl -sS -X POST \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-H "Accept: application/json" \
|
|
||||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
|
|
||||||
-d @- << EOF
|
|
||||||
{
|
|
||||||
"tag_name": "${{ github.ref_name }}",
|
|
||||||
"name": "Release ${{ steps.get_version.outputs.VERSION }}",
|
|
||||||
"body": $(echo "${{ steps.changelog.outputs.CHANGES }}" | jq -R -s .),
|
|
||||||
"draft": false,
|
|
||||||
"prerelease": false
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
|
|
||||||
# Extract and validate release ID
|
|
||||||
RELEASE_ID=$(echo "$RESPONSE" | jq -r .id)
|
|
||||||
if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
|
|
||||||
echo "Error: Failed to get release ID"
|
|
||||||
echo "API Response:"
|
|
||||||
echo "$RESPONSE" | jq .
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Upload binary files
|
|
||||||
for file in "filaman_full.bin" "filaman_ota.bin"; do
|
|
||||||
echo "Uploading $file..."
|
|
||||||
if ! curl -sS -X POST \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: application/octet-stream" \
|
|
||||||
"${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${file}" \
|
|
||||||
--data-binary "@.pio/build/esp32dev/${file}"; then
|
|
||||||
echo "Error: Failed to upload $file"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo "Successfully uploaded $file"
|
|
||||||
done
|
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.2.13"
|
version = "1.2.14"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user