Compare commits
28 Commits
v1.2.30
...
7ae26fb0a9
Author | SHA1 | Date | |
---|---|---|---|
7ae26fb0a9 | |||
98bcf98f1e | |||
bc8ac32fee | |||
ba74eca21d | |||
d4e1cf1322 | |||
5170784e44 | |||
ac323167d0 | |||
003de5bc00 | |||
83595cfadf | |||
cfe21d63d7 | |||
63e72076ed | |||
2a011ee244 | |||
84dd2bd40b | |||
1449cacc0e | |||
f1c2b2eb87 | |||
0f1a3b1d5b | |||
6190cf04db | |||
680aed0e10 | |||
fadb122d28 | |||
4347f89c16 | |||
9856757e49 | |||
afb7b5f42b | |||
ba8506247b | |||
61f3f90d6d | |||
a143527dd0 | |||
f2c9818e61 | |||
9e23af29ff | |||
095885442a |
226
.github/workflows/providers/gitea-release.yml
vendored
226
.github/workflows/providers/gitea-release.yml
vendored
@ -2,36 +2,60 @@ name: Gitea Release
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
gitea_ref_name:
|
||||||
|
description: 'Gitea ref name'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
gitea_server_url:
|
||||||
|
description: 'Gitea server URL'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
gitea_repository:
|
||||||
|
description: 'Gitea repository'
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
secrets:
|
||||||
|
GITEA_TOKEN:
|
||||||
|
required: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
create-release:
|
create-release:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- name: Checkout Repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
- name: Install System Dependencies
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Install PlatformIO
|
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
sudo apt-get update
|
||||||
pip install --upgrade platformio
|
sudo apt-get install -y python3 python3-venv build-essential curl git
|
||||||
|
|
||||||
|
- name: Set up Python Virtual Environment
|
||||||
|
run: |
|
||||||
|
python3 -m venv venv
|
||||||
|
source venv/bin/activate
|
||||||
|
pip install --upgrade pip
|
||||||
|
pip install platformio esptool
|
||||||
|
|
||||||
|
echo "Verifying installations:"
|
||||||
|
platformio --version
|
||||||
|
python3 --version
|
||||||
|
esptool.py version
|
||||||
|
|
||||||
- name: Build Firmware
|
- name: Build Firmware
|
||||||
run: |
|
run: |
|
||||||
pio run -t buildfs # Build SPIFFS
|
source venv/bin/activate
|
||||||
pio run # Build firmware
|
echo "Building SPIFFS..."
|
||||||
|
platformio run -t buildfs
|
||||||
|
|
||||||
- name: Install esptool
|
echo "Building firmware..."
|
||||||
run: |
|
platformio run
|
||||||
pip install esptool
|
|
||||||
|
- name: Create Release Files
|
||||||
- name: Merge firmware and SPIFFS
|
|
||||||
run: |
|
run: |
|
||||||
|
source venv/bin/activate
|
||||||
|
echo "Creating release files..."
|
||||||
esptool.py --chip esp32 merge_bin \
|
esptool.py --chip esp32 merge_bin \
|
||||||
--flash_mode dio \
|
--flash_mode dio \
|
||||||
--flash_freq 40m \
|
--flash_freq 40m \
|
||||||
@ -41,140 +65,52 @@ jobs:
|
|||||||
0x8000 .pio/build/esp32dev/partitions.bin \
|
0x8000 .pio/build/esp32dev/partitions.bin \
|
||||||
0x10000 .pio/build/esp32dev/firmware.bin \
|
0x10000 .pio/build/esp32dev/firmware.bin \
|
||||||
0x290000 .pio/build/esp32dev/spiffs.bin
|
0x290000 .pio/build/esp32dev/spiffs.bin
|
||||||
|
|
||||||
- name: Prepare OTA firmware
|
|
||||||
run: |
|
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||||
|
|
||||||
- name: Get version from tag
|
|
||||||
id: get_version
|
|
||||||
run: |
|
|
||||||
TAG="${GITEA_REF_NAME}"
|
|
||||||
VERSION="${TAG#v}"
|
|
||||||
echo "VERSION=$VERSION" >> $GITEA_OUTPUT
|
|
||||||
|
|
||||||
- name: Read CHANGELOG.md
|
|
||||||
id: changelog
|
|
||||||
run: |
|
|
||||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
|
||||||
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
|
||||||
echo "CHANGES<<EOF" >> $GITEA_OUTPUT
|
|
||||||
echo "$CHANGELOG" >> $GITEA_OUTPUT
|
|
||||||
echo "EOF" >> $GITEA_OUTPUT
|
|
||||||
|
|
||||||
- name: Create Gitea Release
|
- name: Create Release
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
|
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
|
||||||
|
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
|
||||||
|
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
|
||||||
run: |
|
run: |
|
||||||
# Debug: Print all environment variables (excluding the token)
|
|
||||||
env | grep -v "GITEA_TOKEN"
|
|
||||||
|
|
||||||
# Remove trailing slash from server URL if present
|
|
||||||
SERVER_URL="${GITEA_SERVER_URL%/}"
|
|
||||||
REPO="${GITEA_REPOSITORY}"
|
|
||||||
TAG="${GITEA_REF_NAME}"
|
|
||||||
VERSION="${TAG#v}" # Remove v prefix if present
|
|
||||||
|
|
||||||
echo "Debug environment:"
|
echo "Debug environment:"
|
||||||
echo "Server URL: $SERVER_URL"
|
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
|
||||||
echo "Repository: $REPO"
|
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
|
||||||
echo "Tag: $TAG"
|
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
|
||||||
echo "Version: $VERSION"
|
|
||||||
|
|
||||||
# Test API connectivity
|
TAG="${GITEA_REF_NAME}"
|
||||||
echo "Testing API connectivity..."
|
API_URL="${GITEA_SERVER_URL}/api/v1"
|
||||||
TEST_RESPONSE=$(curl -v -k -H "Authorization: token ${GITEA_TOKEN}" "${SERVER_URL}/api/v1/version" 2>&1)
|
REPO="${GITEA_REPOSITORY}"
|
||||||
echo "API Test Response:"
|
|
||||||
echo "$TEST_RESPONSE"
|
|
||||||
|
|
||||||
# Construct clean API URL
|
echo "Creating release for ${TAG} on ${REPO}..."
|
||||||
API_URL="${SERVER_URL}/api/v1"
|
|
||||||
RELEASE_URL="${API_URL}/repos/${REPO}/releases"
|
|
||||||
|
|
||||||
echo "Using Release API URL: $RELEASE_URL"
|
# Create release
|
||||||
|
RESPONSE=$(curl -k -s \
|
||||||
# Common curl options
|
-X POST \
|
||||||
CURL_OPTS="-v -k" # -v for verbose, -k to ignore SSL verification
|
-H "Authorization: token ${TOKEN}" \
|
||||||
|
|
||||||
# Create release with minimal data first
|
|
||||||
echo "Creating release..."
|
|
||||||
RELEASE_RESPONSE=$(curl $CURL_OPTS -X POST \
|
|
||||||
-H "accept: application/json" \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${VERSION}\",\"draft\":false,\"prerelease\":false}" \
|
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
|
||||||
"${RELEASE_URL}" 2>&1)
|
"${API_URL}/repos/${REPO}/releases")
|
||||||
|
|
||||||
echo "Full release creation response (including headers):"
|
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
|
||||||
echo "$RELEASE_RESPONSE"
|
|
||||||
|
|
||||||
# Extract the JSON response (last line)
|
if [ -n "$RELEASE_ID"; then
|
||||||
RELEASE_JSON=$(echo "$RELEASE_RESPONSE" | tail -n 1)
|
echo "Release created with ID: $RELEASE_ID"
|
||||||
echo "Release JSON response:"
|
|
||||||
echo "$RELEASE_JSON" | jq '.' || echo "Failed to parse JSON response"
|
# Upload files
|
||||||
|
for file in "filaman_full.bin" "filaman_ota.bin"; do
|
||||||
# Get release ID
|
echo "Uploading $file..."
|
||||||
RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
|
curl -k -s \
|
||||||
|
-X POST \
|
||||||
if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
|
-H "Authorization: token ${TOKEN}" \
|
||||||
echo "Failed to create release. Full response:"
|
-H "Content-Type: application/octet-stream" \
|
||||||
echo "$RELEASE_RESPONSE"
|
--data-binary "@.pio/build/esp32dev/$file" \
|
||||||
# Try to get more detailed error information
|
"${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
|
||||||
ERROR_MSG=$(echo "$RELEASE_JSON" | jq -r '.message // .error // "Unknown error"')
|
done
|
||||||
echo "Error message: $ERROR_MSG"
|
else
|
||||||
|
echo "Failed to create release. Response:"
|
||||||
|
echo "$RESPONSE"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Successfully created release with ID: $RELEASE_ID"
|
|
||||||
|
|
||||||
# Upload assets
|
|
||||||
for file in "filaman_full.bin" "filaman_ota.bin"; do
|
|
||||||
echo "Uploading $file..."
|
|
||||||
UPLOAD_URL="${RELEASE_URL}/${RELEASE_ID}/assets?name=${file}"
|
|
||||||
echo "Upload URL: $UPLOAD_URL"
|
|
||||||
|
|
||||||
UPLOAD_RESPONSE=$(curl $CURL_OPTS -X POST \
|
|
||||||
-H "accept: application/json" \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: application/octet-stream" \
|
|
||||||
--data-binary "@.pio/build/esp32dev/${file}" \
|
|
||||||
"${UPLOAD_URL}" 2>&1)
|
|
||||||
|
|
||||||
echo "Full upload response for $file (including headers):"
|
|
||||||
echo "$UPLOAD_RESPONSE"
|
|
||||||
|
|
||||||
# Extract the JSON response (last line)
|
|
||||||
UPLOAD_JSON=$(echo "$UPLOAD_RESPONSE" | tail -n 1)
|
|
||||||
echo "Upload JSON response:"
|
|
||||||
echo "$UPLOAD_JSON" | jq '.' || echo "Failed to parse JSON response"
|
|
||||||
|
|
||||||
if ! echo "$UPLOAD_JSON" | jq -e '.id' > /dev/null; then
|
|
||||||
echo "Failed to upload $file. Full response:"
|
|
||||||
echo "$UPLOAD_RESPONSE"
|
|
||||||
ERROR_MSG=$(echo "$UPLOAD_JSON" | jq -r '.message // .error // "Unknown error"')
|
|
||||||
echo "Error message: $ERROR_MSG"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Successfully uploaded $file"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Update release with full description after successful file upload
|
|
||||||
echo "Updating release description..."
|
|
||||||
CHANGELOG='${{ steps.changelog.outputs.CHANGES }}'
|
|
||||||
UPDATE_RESPONSE=$(curl $CURL_OPTS -X PATCH \
|
|
||||||
-H "accept: application/json" \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "{\"body\":$(echo "$CHANGELOG" | jq -R -s .)}" \
|
|
||||||
"${RELEASE_URL}/${RELEASE_ID}" 2>&1)
|
|
||||||
|
|
||||||
echo "Full update response (including headers):"
|
|
||||||
echo "$UPDATE_RESPONSE"
|
|
||||||
|
|
||||||
# Extract the JSON response (last line)
|
|
||||||
UPDATE_JSON=$(echo "$UPDATE_RESPONSE" | tail -n 1)
|
|
||||||
echo "Update JSON response:"
|
|
||||||
echo "$UPDATE_JSON" | jq '.' || echo "Failed to parse JSON response"
|
|
||||||
|
|
||||||
echo "Release process completed"
|
|
33
.github/workflows/release.yml
vendored
33
.github/workflows/release.yml
vendored
@ -10,6 +10,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
provider: ${{ steps.provider.outputs.provider }}
|
provider: ${{ steps.provider.outputs.provider }}
|
||||||
|
gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
|
||||||
|
gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
|
||||||
|
gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@ -20,25 +23,23 @@ jobs:
|
|||||||
echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
|
echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
|
||||||
echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
|
echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
|
||||||
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
|
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
|
||||||
|
echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
|
||||||
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
|
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
|
||||||
|
|
||||||
- name: Determine CI Provider
|
- name: Determine CI Provider
|
||||||
id: provider
|
id: provider
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Initialize provider as unknown
|
|
||||||
PROVIDER="unknown"
|
|
||||||
|
|
||||||
# Check for Gitea specific environment first
|
|
||||||
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
|
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
|
||||||
PROVIDER="gitea"
|
echo "provider=gitea" >> "$GITHUB_OUTPUT"
|
||||||
# Then check for GitHub
|
echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
|
||||||
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
|
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
|
||||||
PROVIDER="github"
|
echo "provider=github" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "provider=unknown" >> "$GITHUB_OUTPUT"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Detected provider: ${PROVIDER}"
|
|
||||||
echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
|
|
||||||
|
|
||||||
verify-provider:
|
verify-provider:
|
||||||
needs: route
|
needs: route
|
||||||
@ -53,11 +54,17 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
github-release:
|
github-release:
|
||||||
needs: verify-provider
|
needs: [route, verify-provider]
|
||||||
if: needs.route.outputs.provider == 'github'
|
if: needs.route.outputs.provider == 'github'
|
||||||
uses: ./.github/workflows/providers/github-release.yml
|
uses: ./.github/workflows/providers/github-release.yml
|
||||||
|
|
||||||
gitea-release:
|
gitea-release:
|
||||||
needs: verify-provider
|
needs: [route, verify-provider]
|
||||||
if: needs.route.outputs.provider == 'gitea'
|
if: needs.route.outputs.provider == 'gitea'
|
||||||
uses: ./.github/workflows/providers/gitea-release.yml
|
uses: ./.github/workflows/providers/gitea-release.yml
|
||||||
|
with:
|
||||||
|
gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
|
||||||
|
gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
|
||||||
|
gitea_repository: ${{ needs.route.outputs.gitea_repository }}
|
||||||
|
secrets:
|
||||||
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
70
CHANGELOG.md
70
CHANGELOG.md
@ -1,5 +1,75 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.2.44] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow to include additional outputs and increment version to 1.2.44
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.43] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.42] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow to include additional outputs and increment version to 1.2.42
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.41] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow debug output and increment version to 1.2.41
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.40] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- add inputs for Gitea release workflow and increment version to 1.2.40
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.39] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.38] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow and increment version to 1.2.38
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.37] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow and increment version to 1.2.37
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.36] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow and increment version to 1.2.36
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.35] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow and version to 1.2.35
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.34] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.34 and enhance Gitea and GitHub release workflows
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.33] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.33 and refactor release workflows for Gitea and GitHub
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.32] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.31] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.31
|
||||||
|
|
||||||
|
|
||||||
## [1.2.30] - 2025-02-19
|
## [1.2.30] - 2025-02-19
|
||||||
### Added
|
### Added
|
||||||
- update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration
|
- update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.2.30"
|
version = "1.2.44"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Reference in New Issue
Block a user