Skip to content

Commit

Permalink
New Version 1.28.0
Browse files Browse the repository at this point in the history
- E #210 Bed/Tool-Temperatures
- E #251 Release Channel and Stale-Action
  • Loading branch information
OllisGit committed Jan 26, 2022
1 parent ddad3a9 commit d46f3bd
Show file tree
Hide file tree
Showing 9 changed files with 275 additions and 42 deletions.
File renamed without changes.
62 changes: 31 additions & 31 deletions .github/workflows/github-release-actions.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
###
### Simple script to build a zip file of the whole repository
###
#
#script:
## debug - echo 'Hello World'
# - export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)
# - zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
## debug - ls -al
#
### see "Fix travis automatic build and deploy"
### https://github.com/oliexdev/openScale/pull/121
### https://github.com/oliexdev/openScale/pull/121/files
#before_deploy:
# - git tag -f travis-build
# - git remote add gh https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
# - git push -f gh travis-build
# - git remote remove gh
#
#deploy:
# name: "V${PLUGIN_VERSION}-draft"
# #prerelease: true
# draft: true
# provider: releases
# api_key: "${GITHUB_TOKEN}"
# file: "master.zip"
# overwrite: true
# skip_cleanup: true
# target_commitish: $TRAVIS_COMMIT


## Major - Tasks:
# - ZIP
# - Build draft release
# - Attach Zip
# - Download Zip

name: Build Plugin Release - Action
on: [push]
Expand All @@ -53,17 +30,37 @@ jobs:
run: echo "::set-output name=version::$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)"
id: version

- name: Repository and Branch name
id: branch
run: |
export branch_name=${GITHUB_REF##*/}
echo "::set-output name=branch_name::$branch_name"
echo running on branch $branch_name
export repo_name=${GITHUB_REPOSITORY#*/}
echo "::set-output name=repo_name::$repo_name"
- name: release
uses: actions/create-release@v1
uses: actions/create-release@latest
id: create_release
env:
GITHUB_TOKEN: ${{ github.token }}
with:
draft: true
commitish: ${{ steps.branch.outputs.branch_name }}
prerelease: false
release_name: V${{ steps.version.outputs.version }}-draft
tag_name: ${{ steps.version.outputs.version }}-draft
body_path: RELEASE_TEMPLATE.md
body: |
## [BugFix]
- #xxx
## [Enhancement]
- #xxx
## Counter
![downloaded](https://img.shields.io/github/downloads/OllisGit/${{ steps.branch.outputs.repo_name }}/${{ steps.version.outputs.version }}/total)
# body_path: RELEASE_TEMPLATE.md

- name: upload master.zip to release
uses: actions/upload-release-asset@v1
Expand All @@ -75,4 +72,7 @@ jobs:
asset_name: master.zip
asset_content_type: application/gzip

- run: echo "🍏 This job's status is ${{ job.status }}."
- name: download master.zip
run: curl -O -J -L -v https://github.com/OllisGit/${{ steps.branch.outputs.repo_name }}/releases/download/${{ steps.version.outputs.version }}/master.zip

- run: echo "🍏 This job's status is ${{ job.status }}."
24 changes: 24 additions & 0 deletions .github/workflows/github-stale-actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
## Documentation could be found here
## https://github.com/actions/stale
##
name: 'Stale and close issues'
on:
schedule:
# Each day at 1:30am run the action
- cron: '30 1 * * *'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
with:
exempt-issue-labels: 'status: analysing,status: inNextRelease,status: inProgress,status: wontfix'

days-before-issue-stale: 30
stale-issue-message: 'This issue has been automatically marked for closing, because it has not had activity in 30 days. It will be closed if no further activity occurs in 10 days.'
stale-issue-label: 'status: markedForAutoClose'

days-before-issue-close: 10
close-issue-message: 'This issue was closed, because it has been already marked for 10 days with no activity.'
close-issue-label: 'status: closedByBot'
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ It shows:
* ```ChangeFilamentTimeLeft, EstimatedChangeFilamentTime and ChangefilamentCount (based on M600 command location in file)```
* ```Printer State```
* ```Currently printed filename```
* ```Bed and Tool Tempertures```

Some output examples:
- Printer Display: ```50% L=60/120 H=23mm/47mm```
Expand Down Expand Up @@ -78,6 +79,23 @@ or manually using this URL:

https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip

After installation, you can listen on three release channels (since 1.28.0).
What does this mean: Each channel has its own release-version and each release has a different kind of functionality and stability.

- **"Only Release"**: Only stable and tested versions will be shown in the software-update section of OctoPrint
- **"Release & Candidate"**: Beside the stable release, you can also see the "release-candidates", like '''1.29.0rc3'''.
The rc's includde new functionalty/bugfixes and are already tested by the community.. so by YOU ;-)
- **"Release & Candidate & in Development"**: Beside stable and rc, you will be informed about development versions.
A development version like '''1.30.0.dev5``` could include a new (experimental) feature/bugfix, but it is not fully tested by the community

Changing between each release is done via the "Software Update section" in the settings.
![release-channels](screenshots/release-channels.png "Release channels")

**!!! If you use the development-channel, you can use the latest feature and can improve the quality of the plugin !!!**

Hint: "Easy-switching" is possible with OctoPrint-Version 1.8.0 (see https://github.com/OctoPrint/OctoPrint/issues/4238).
At the meantime you need to uninstall and install the version you like from the selected channel...or stay in one channel ;-)


## Configuration

Expand Down
Loading

0 comments on commit d46f3bd

Please sign in to comment.