Compare commits
13 Commits
v1.3.61
...
1148947b8e
Author | SHA1 | Date | |
---|---|---|---|
1148947b8e | |||
3b01336999 | |||
44614b58dc | |||
ed8d618272 | |||
cd2ac54e98 | |||
92f675b24c | |||
c342877558 | |||
f5743cbd7b | |||
8a62597705 | |||
374721d1e5 | |||
ea6f708c6e | |||
78169dfdb1 | |||
074bfb658d |
34
.github/workflows/gitea-release.yml
vendored
34
.github/workflows/gitea-release.yml
vendored
@ -12,6 +12,8 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
@ -69,29 +71,49 @@ jobs:
|
|||||||
- name: Generate Release Notes
|
- name: Generate Release Notes
|
||||||
id: release_notes
|
id: release_notes
|
||||||
run: |
|
run: |
|
||||||
CURRENT_TAG=$(git describe --tags --abbrev=0)
|
# Fetch all tags first
|
||||||
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^)
|
git fetch --tags
|
||||||
|
|
||||||
if [ -n "$PREVIOUS_TAG" ]; then
|
# Get all tags sorted by version
|
||||||
|
TAGS=($(git tag -l 'v*' --sort=-v:refname))
|
||||||
|
CURRENT_TAG="${TAGS[0]}"
|
||||||
|
|
||||||
|
# Get previous tag (second in list)
|
||||||
|
if [ ${#TAGS[@]} -gt 1 ]; then
|
||||||
|
PREVIOUS_TAG="${TAGS[1]}"
|
||||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
|
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
|
||||||
echo "" >> $GITHUB_OUTPUT
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# Get commits between previous and current tag
|
# Get commits between previous and current tag
|
||||||
echo "### Added" >> $GITHUB_OUTPUT
|
echo "### Added" >> $GITHUB_OUTPUT
|
||||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
|
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "" >> $GITHUB_OUTPUT
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
echo "### Fixed" >> $GITHUB_OUTPUT
|
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
|
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "" >> $GITHUB_OUTPUT
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
echo "### Changed" >> $GITHUB_OUTPUT
|
echo "### Changed" >> $GITHUB_OUTPUT
|
||||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
|
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
|
# First release or no previous tag
|
||||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "Initial Release" >> $GITHUB_OUTPUT
|
echo "Initial Release" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
# Add all commits for initial release
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
echo "### Added" >> $GITHUB_OUTPUT
|
||||||
|
git log --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||||
|
git log --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
echo "### Changed" >> $GITHUB_OUTPUT
|
||||||
|
git log --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
32
.github/workflows/github-release.yml
vendored
32
.github/workflows/github-release.yml
vendored
@ -76,29 +76,49 @@ jobs:
|
|||||||
- name: Generate Release Notes
|
- name: Generate Release Notes
|
||||||
id: release_notes
|
id: release_notes
|
||||||
run: |
|
run: |
|
||||||
CURRENT_TAG=$(git describe --tags --abbrev=0)
|
# Fetch all tags first
|
||||||
PREVIOUS_TAG=$(git describe --tags --abbrev=0 ${CURRENT_TAG}^)
|
git fetch --tags
|
||||||
|
|
||||||
if [ -n "$PREVIOUS_TAG" ]; then
|
# Get all tags sorted by version
|
||||||
|
TAGS=($(git tag -l 'v*' --sort=-v:refname))
|
||||||
|
CURRENT_TAG="${TAGS[0]}"
|
||||||
|
|
||||||
|
# Get previous tag (second in list)
|
||||||
|
if [ ${#TAGS[@]} -gt 1 ]; then
|
||||||
|
PREVIOUS_TAG="${TAGS[1]}"
|
||||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
|
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
|
||||||
echo "" >> $GITHUB_OUTPUT
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# Get commits between previous and current tag
|
# Get commits between previous and current tag
|
||||||
echo "### Added" >> $GITHUB_OUTPUT
|
echo "### Added" >> $GITHUB_OUTPUT
|
||||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
|
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "" >> $GITHUB_OUTPUT
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
echo "### Fixed" >> $GITHUB_OUTPUT
|
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
|
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "" >> $GITHUB_OUTPUT
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
echo "### Changed" >> $GITHUB_OUTPUT
|
echo "### Changed" >> $GITHUB_OUTPUT
|
||||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
|
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
|
# First release or no previous tag
|
||||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||||
echo "Initial Release" >> $GITHUB_OUTPUT
|
echo "Initial Release" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
# Add all commits for initial release
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
echo "### Added" >> $GITHUB_OUTPUT
|
||||||
|
git log --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||||
|
git log --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
|
echo "" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
echo "### Changed" >> $GITHUB_OUTPUT
|
||||||
|
git log --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' | sort -u >> $GITHUB_OUTPUT || true
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
27
CHANGELOG.md
27
CHANGELOG.md
@ -1,5 +1,32 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.65] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.65
|
||||||
|
- ci: improve release note generation by fetching tags and sorting unique commits
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.64] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.64
|
||||||
|
- remove unnecessary closing tags from header.html
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.63] - 2025-02-22
|
||||||
|
### Added
|
||||||
|
- update update-form background and add glass border effect
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.63
|
||||||
|
- update release note generation for initial release handling
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.62] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.62
|
||||||
|
- update background colors and improve layout for update sections
|
||||||
|
|
||||||
|
|
||||||
## [1.3.61] - 2025-02-22
|
## [1.3.61] - 2025-02-22
|
||||||
### Added
|
### Added
|
||||||
- update release notes generation to use previous tag for changes
|
- update release notes generation to use previous tag for changes
|
||||||
|
@ -44,6 +44,4 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
|
@ -44,8 +44,6 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- head -->
|
<!-- head -->
|
||||||
|
|
||||||
|
@ -44,8 +44,6 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- head -->
|
<!-- head -->
|
||||||
|
|
||||||
|
@ -44,8 +44,6 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- head -->
|
<!-- head -->
|
||||||
|
|
||||||
|
@ -1051,9 +1051,10 @@ input[type="submit"]:disabled,
|
|||||||
}
|
}
|
||||||
.update-form {
|
.update-form {
|
||||||
background: var(--primary-color);
|
background: var(--primary-color);
|
||||||
|
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
|
||||||
|
border: var(--glass-border);
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
|
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@ -1064,7 +1065,7 @@ input[type="submit"]:disabled,
|
|||||||
padding: 8px;
|
padding: 8px;
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
background: white;
|
background-color: #4CAF50;
|
||||||
}
|
}
|
||||||
.update-form input[type="submit"] {
|
.update-form input[type="submit"] {
|
||||||
background-color: #4CAF50;
|
background-color: #4CAF50;
|
||||||
@ -1086,10 +1087,66 @@ input[type="submit"]:disabled,
|
|||||||
.warning {
|
.warning {
|
||||||
background-color: var(--primary-color);
|
background-color: var(--primary-color);
|
||||||
border: 1px solid #ffe0b2;
|
border: 1px solid #ffe0b2;
|
||||||
color: white;
|
|
||||||
padding: 15px;
|
|
||||||
margin: 20px auto;
|
margin: 20px auto;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
max-width: 600px;
|
max-width: 600px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
color: #e65100;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.update-options {
|
||||||
|
display: flex;
|
||||||
|
gap: 2rem;
|
||||||
|
margin: 2rem 0;
|
||||||
|
}
|
||||||
|
.update-section {
|
||||||
|
flex: 1;
|
||||||
|
background: var(--background-green);
|
||||||
|
padding: 1.5rem;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
.update-section h2 {
|
||||||
|
margin-top: 0;
|
||||||
|
color: #333;
|
||||||
|
}
|
||||||
|
.update-section p {
|
||||||
|
color: #666;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
.progress-container {
|
||||||
|
margin: 20px 0;
|
||||||
|
background: #f0f0f0;
|
||||||
|
border-radius: 4px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.progress-bar {
|
||||||
|
width: 0;
|
||||||
|
height: 20px;
|
||||||
|
background: #4CAF50;
|
||||||
|
transition: width 0.3s ease-in-out;
|
||||||
|
text-align: center;
|
||||||
|
line-height: 20px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
.status {
|
||||||
|
margin-top: 20px;
|
||||||
|
padding: 10px;
|
||||||
|
border-radius: 4px;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
.status.success {
|
||||||
|
background: #e8f5e9;
|
||||||
|
color: #2e7d32;
|
||||||
|
}
|
||||||
|
.status.error {
|
||||||
|
background: #ffebee;
|
||||||
|
color: #c62828;
|
||||||
|
}
|
||||||
|
.warning {
|
||||||
|
background: #fff3e0;
|
||||||
|
color: #e65100;
|
||||||
|
padding: 15px;
|
||||||
|
border-radius: 4px;
|
||||||
|
margin-bottom: 20px;
|
||||||
}
|
}
|
@ -44,8 +44,6 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- head -->
|
<!-- head -->
|
||||||
|
|
||||||
@ -86,64 +84,6 @@
|
|||||||
<div class="status"></div>
|
<div class="status"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
|
||||||
.update-options {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
.update-section {
|
|
||||||
flex: 1;
|
|
||||||
background: #f5f5f5;
|
|
||||||
padding: 1.5rem;
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
.update-section h2 {
|
|
||||||
margin-top: 0;
|
|
||||||
color: #333;
|
|
||||||
}
|
|
||||||
.update-section p {
|
|
||||||
color: #666;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
.progress-container {
|
|
||||||
margin: 20px 0;
|
|
||||||
background: #f0f0f0;
|
|
||||||
border-radius: 4px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.progress-bar {
|
|
||||||
width: 0;
|
|
||||||
height: 20px;
|
|
||||||
background: #4CAF50;
|
|
||||||
transition: width 0.3s ease-in-out;
|
|
||||||
text-align: center;
|
|
||||||
line-height: 20px;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
.status {
|
|
||||||
margin-top: 20px;
|
|
||||||
padding: 10px;
|
|
||||||
border-radius: 4px;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.status.success {
|
|
||||||
background: #e8f5e9;
|
|
||||||
color: #2e7d32;
|
|
||||||
}
|
|
||||||
.status.error {
|
|
||||||
background: #ffebee;
|
|
||||||
color: #c62828;
|
|
||||||
}
|
|
||||||
.warning {
|
|
||||||
background: #fff3e0;
|
|
||||||
color: #e65100;
|
|
||||||
padding: 15px;
|
|
||||||
border-radius: 4px;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Hide status indicators during update
|
// Hide status indicators during update
|
||||||
const statusContainer = document.querySelector('.status-container');
|
const statusContainer = document.querySelector('.status-container');
|
||||||
|
@ -44,8 +44,6 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- head -->
|
<!-- head -->
|
||||||
|
|
||||||
|
@ -44,8 +44,6 @@
|
|||||||
<div class="ram-status" id="ramStatus"></div>
|
<div class="ram-status" id="ramStatus"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
<!-- head -->
|
<!-- head -->
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.61"
|
version = "1.3.65"
|
||||||
|
|
||||||
#test
|
#test
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user