diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 8524d55..975bb73 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,12 +5,10 @@ on: push: branches: - main - - latest - devel pull_request: branches: - main - - latest - devel jobs: check: diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml index a631058..efafe3d 100644 --- a/.github/workflows/manifest.yml +++ b/.github/workflows/manifest.yml @@ -6,7 +6,6 @@ on: push: branches: - main - - latest - devel # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages @@ -43,7 +42,7 @@ jobs: - name: Create outputs folders if: success() || failure() shell: bash - run: mkdir deploy; mkdir deploy/manifests; mkdir deploy/manifests/main deploy/manifests/latest deploy/manifests/devel + run: mkdir deploy; mkdir deploy/manifests; mkdir deploy/manifests/main deploy/manifests/devel - name: Generate manifest and shields for main branch id: manifest-main if: ${{ (success() || failure()) && steps.checkout-main.outcome == 'success' }} @@ -51,21 +50,6 @@ jobs: - name: Save main's manifest if: ${{ (success() || failure()) && steps.manifest-main.outcome == 'success' }} run: mv install_manifest.json deploy/manifests/main - # Generate manifest for latest branch - - name: Checkout latest - id: checkout-latest - if: success() || failure() - uses: actions/checkout@v3 - with: - ref: 'latest' - clean: false - - name: Generate manifest for latest - id: manifest-latest - if: ${{ (success() || failure()) && steps.checkout-latest.outcome == 'success' }} - run: python imgen.py - - name: Save latest's manifest - if: ${{ (success() || failure()) && steps.manifest-latest.outcome == 'success' }} - run: mv install_manifest.json deploy/manifests/latest # Generate manifest for devel branch - name: Checkout devel id: checkout-devel diff --git a/ccmsi.lua b/ccmsi.lua index 432bbef..cc4a5d0 100644 --- a/ccmsi.lua +++ b/ccmsi.lua @@ -18,7 +18,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. local function println(message) print(tostring(message)) end local function print(message) term.write(tostring(message)) end -local CCMSI_VERSION = "v1.13" +local CCMSI_VERSION = "v1.14" local install_dir = "/.install-cache" local manifest_path = "https://mikaylafischler.github.io/cc-mek-scada/manifests/" @@ -213,7 +213,7 @@ if #opts == 0 or opts[1] == "help" then println(" pocket - pocket application") println(" installer - ccmsi installer (update only)") white();println("") - lgray();println(" main (default) | latest | devel");white() + lgray();println(" main (default) | devel");white() return else mode = get_opt(opts[1], { "check", "install", "update", "uninstall" }) @@ -233,7 +233,7 @@ else -- determine target if mode == "check" then target = opts[2] else target = opts[3] end - if (target ~= "main") and (target ~= "latest") and (target ~= "devel") then + if (target ~= "main") and (target ~= "devel") then if (target and target ~= "") then yellow();println("Unknown target, defaulting to 'main'");white() end target = "main" end