mirror of
https://github.com/MikaylaFischler/cc-mek-scada.git
synced 2024-08-30 18:22:34 +00:00
#421 remove 'latest' branch
This commit is contained in:
parent
940f71aa35
commit
158cc39b80
2
.github/workflows/check.yml
vendored
2
.github/workflows/check.yml
vendored
@ -5,12 +5,10 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- latest
|
|
||||||
- devel
|
- devel
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- latest
|
|
||||||
- devel
|
- devel
|
||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
|
18
.github/workflows/manifest.yml
vendored
18
.github/workflows/manifest.yml
vendored
@ -6,7 +6,6 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- latest
|
|
||||||
- devel
|
- devel
|
||||||
|
|
||||||
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
|
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
|
||||||
@ -43,7 +42,7 @@ jobs:
|
|||||||
- name: Create outputs folders
|
- name: Create outputs folders
|
||||||
if: success() || failure()
|
if: success() || failure()
|
||||||
shell: bash
|
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
|
- name: Generate manifest and shields for main branch
|
||||||
id: manifest-main
|
id: manifest-main
|
||||||
if: ${{ (success() || failure()) && steps.checkout-main.outcome == 'success' }}
|
if: ${{ (success() || failure()) && steps.checkout-main.outcome == 'success' }}
|
||||||
@ -51,21 +50,6 @@ jobs:
|
|||||||
- name: Save main's manifest
|
- name: Save main's manifest
|
||||||
if: ${{ (success() || failure()) && steps.manifest-main.outcome == 'success' }}
|
if: ${{ (success() || failure()) && steps.manifest-main.outcome == 'success' }}
|
||||||
run: mv install_manifest.json deploy/manifests/main
|
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
|
# Generate manifest for devel branch
|
||||||
- name: Checkout devel
|
- name: Checkout devel
|
||||||
id: checkout-devel
|
id: checkout-devel
|
||||||
|
@ -18,7 +18,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||||||
local function println(message) print(tostring(message)) end
|
local function println(message) print(tostring(message)) end
|
||||||
local function print(message) term.write(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 install_dir = "/.install-cache"
|
||||||
local manifest_path = "https://mikaylafischler.github.io/cc-mek-scada/manifests/"
|
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(" pocket - pocket application")
|
||||||
println(" installer - ccmsi installer (update only)")
|
println(" installer - ccmsi installer (update only)")
|
||||||
white();println("<branch>")
|
white();println("<branch>")
|
||||||
lgray();println(" main (default) | latest | devel");white()
|
lgray();println(" main (default) | devel");white()
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
mode = get_opt(opts[1], { "check", "install", "update", "uninstall" })
|
mode = get_opt(opts[1], { "check", "install", "update", "uninstall" })
|
||||||
@ -233,7 +233,7 @@ else
|
|||||||
|
|
||||||
-- determine target
|
-- determine target
|
||||||
if mode == "check" then target = opts[2] else target = opts[3] end
|
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
|
if (target and target ~= "") then yellow();println("Unknown target, defaulting to 'main'");white() end
|
||||||
target = "main"
|
target = "main"
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user