Merge branch 'main' of https://github.com/dojohnso/OctoPrint-SpoolMan…

…ager

.github/settings.yml

@@ -23,7 +23,11 @@ repository:
 #  has_downloads: true
 
   # Updates the default branch for this repository.
+<<<<<<< HEAD
   default_branch: master
+=======
+#  default_branch: main
+>>>>>>> c2d52c7bfffb42a77e076dee05e6c79361355640
 
   # Either `true` to allow squash-merging pull requests, or `false` to prevent
   # squash-merging.

.github/workflows/RELEASE_TEMPLATE.md

@@ -0,0 +1,16 @@
+*If you would like to help test new changes or just see what's coming before everyone else, head to your Software Update panel and set the Release Channel to Release & Development.*
+
+## [BugFix]
+- #xxx
+
+## [Enhancement]
+- #xxx
+
+## Counter
+![downloaded](https://img.shields.io/github/downloads/dojohnso/OctoPrint-SpoolManager/xxx/total)
+
+### NOTE: this plugin has been abandoned by the original creator and adopted here by a new maintainer
+
+**This plugin is under new management** and will focus on critical bug fixes to start. Please bear with me as I get acclimated to this new plugin. If you would like to support these new efforts, please consider buying me a coffee or two. Thank you!
+
+<a href="https://www.buymeacoffee.com/djohnson.tech" target="_blank"><img src="https://djohnson.tech/images/white-button.png" width=300 /></a>

.github/workflows/github-release-actions.yml

@@ -18,6 +18,11 @@ jobs:
       - name: Build release .zip
         run: zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
 
+<<<<<<< HEAD
+=======
+      - run: echo "Build ZIP"
+      - run: zip -r main.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
+>>>>>>> c2d52c7bfffb42a77e076dee05e6c79361355640
       - name: List files in the repository
         run: |
           ls ${{ github.workspace }}
@@ -44,5 +49,33 @@ jobs:
       - name: Verify master.zip
         run: curl -O -J -L -v https://github.com/${{ env.GITHUB_REPOSITORY }}/releases/download/${{ steps.version.outputs.version }}/master.zip
 
+<<<<<<< HEAD
       - name: Finish
         run: echo "🍏 This job's status is ${{ job.status }}."
+=======
+            ## Counter
+            ![downloaded](https://img.shields.io/github/downloads/dojohnso/${{ steps.branch.outputs.repo_name }}/${{ steps.version.outputs.version }}/total)
+
+            ## *NOTE: this plugin has been abandoned by the original creator and adopted here by a new maintainer*
+
+            **This plugin is under new management** and will focus on critical bug fixes to start. Please bear with me as I get acclimated to this new plugin. If you would like to support these new efforts, please consider buying me a coffee or two. Thank you!
+
+            <a href="https://www.buymeacoffee.com/djohnson.tech" target="_blank"><img src="https://djohnson.tech/images/white-button.png" width=300 /></a>
+
+#          body_path: RELEASE_TEMPLATE.md
+
+      - name: upload main.zip to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: main.zip
+          asset_name: main.zip
+          asset_content_type: application/gzip
+
+      - name: download main.zip
+        run: curl -O -J -L -v https://github.com/dojohnso/${{ steps.branch.outputs.repo_name }}/releases/download/${{ steps.version.outputs.version }}/main.zip
+
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+>>>>>>> c2d52c7bfffb42a77e076dee05e6c79361355640

.gitignore

@@ -8,3 +8,4 @@ dist
 .DS_Store
 *.zip
 .venv
+.vscode

.travis.yml.notusedanymore

@@ -0,0 +1,31 @@
+##
+## 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 main.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: "main.zip"
+  overwrite: true
+  skip_cleanup: true
+  target_commitish: $TRAVIS_COMMIT
+  on:
+    tags: false