Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devops/strip-sem-meta' into 'dev'

Browse Source 
Strip semver meta

See merge request crafty-controller/crafty-4!483
This commit is contained in:
Iain Powrie 2022-10-08 21:35:40 +00:00
commit a96753d3a7
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/docker-build.yml vendored
View File

@ -58,8 +58,7 @@ jobs:
MAJOR=$(cat app/config/version.json | jq '.major' ) MAJOR=$(cat app/config/version.json | jq '.major' )
MINOR=$(cat app/config/version.json | jq '.minor' ) MINOR=$(cat app/config/version.json | jq '.minor' )
SUB=$(cat app/config/version.json | jq '.sub' ) SUB=$(cat app/config/version.json | jq '.sub' )
META=$(cat app/config/version.json | jq -r '.meta' ) echo "::set-output name=version::$MAJOR.$MINOR.$SUB"
echo "::set-output name=version::$MAJOR.$MINOR.$SUB-$META"
- name: Get branch tag - name: Get branch tag
id: branch id: branch

6
.gitlab/docker-build.yml
View File

@ -17,7 +17,6 @@ docker-build-dev:
MAJOR=$(cat app/config/version.json | jq '.major' ) MAJOR=$(cat app/config/version.json | jq '.major' )
MINOR=$(cat app/config/version.json | jq '.minor' ) MINOR=$(cat app/config/version.json | jq '.minor' )
SUB=$(cat app/config/version.json | jq '.sub' ) SUB=$(cat app/config/version.json | jq '.sub' )
META=$(cat app/config/version.json | jq -r '.meta' )
- | - |
apk --no-cache add curl apk --no-cache add curl
latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p') latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p')
@ -33,7 +32,7 @@ docker-build-dev:
script: script:
- | - |
tag=":$CI_COMMIT_REF_SLUG" tag=":$CI_COMMIT_REF_SLUG"
VERSION="${MAJOR}.${MINOR}.${SUB}-${META}" VERSION="${MAJOR}.${MINOR}.${SUB}"
- | - |
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag" echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
echo "Crafty Version: $VERSION" echo "Crafty Version: $VERSION"
@ -72,7 +71,6 @@ docker-build-prod:
MAJOR=$(cat app/config/version.json | jq '.major' ) MAJOR=$(cat app/config/version.json | jq '.major' )
MINOR=$(cat app/config/version.json | jq '.minor' ) MINOR=$(cat app/config/version.json | jq '.minor' )
SUB=$(cat app/config/version.json | jq '.sub' ) SUB=$(cat app/config/version.json | jq '.sub' )
META=$(cat app/config/version.json | jq -r '.meta' )
- | - |
apk --no-cache add curl apk --no-cache add curl
latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p') latest_tag=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | sed -Ene '/^ *"tag_name": *"(v.+)",$/s//\1/p')
@ -87,7 +85,7 @@ docker-build-prod:
- echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY - echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
script: script:
- | - |
VERSION="${MAJOR}.${MINOR}.${SUB}-${META}" VERSION="${MAJOR}.${MINOR}.${SUB}"
- | - |
echo "Running on branch '$CI_COMMIT_BRANCH'" echo "Running on branch '$CI_COMMIT_BRANCH'"
echo "Crafty Version: $VERSION" echo "Crafty Version: $VERSION"

8
README.md
View File

@ -2,11 +2,11 @@
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Supported Python Versions](https://shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20-blue)](https://www.python.org) [![Supported Python Versions](https://shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20-blue)](https://www.python.org)
[![Version(temp-hardcoded)](https://img.shields.io/badge/release-v4.0.16--beta-orange)](https://gitlab.com/crafty-controller/crafty-4/-/releases) [![Version](https://img.shields.io/badge/release-v4.0.16-blue)](https://gitlab.com/crafty-controller/crafty-4/-/releases)
[![Code Quality(temp-hardcoded)](https://img.shields.io/badge/code%20quality-10-brightgreen)](https://gitlab.com/crafty-controller/crafty-4) [![Code Quality](https://img.shields.io/badge/code%20quality-10-brightgreen)](https://gitlab.com/crafty-controller/crafty-4)
[![Build Status](https://gitlab.com/crafty-controller/crafty-4/badges/master/pipeline.svg)](https://gitlab.com/crafty-controller/crafty-4/-/commits/master) [![Build Status](https://gitlab.com/crafty-controller/crafty-4/badges/master/pipeline.svg)](https://gitlab.com/crafty-controller/crafty-4/-/commits/master)
[![Licence](https://img.shields.io/gitlab/license/20430749)](https://gitlab.com/crafty-controller/crafty-4/-/blob/master/LICENSE)
# Crafty Controller 4.0.15-beta # Crafty Controller 4.0.16
> Python based Control Panel for your Minecraft Server > Python based Control Panel for your Minecraft Server
## What is Crafty Controller? ## What is Crafty Controller?

3
app/classes/shared/helpers.py
View File

@ -450,10 +450,9 @@ class Helpers:
major = version_data.get("major", "?") major = version_data.get("major", "?")
minor = version_data.get("minor", "?") minor = version_data.get("minor", "?")
sub = version_data.get("sub", "?") sub = version_data.get("sub", "?")
meta = version_data.get("meta", "?")
# set some defaults if we don't get version_data from our helper # set some defaults if we don't get version_data from our helper
version = f"{major}.{minor}.{sub}-{meta}" version = f"{major}.{minor}.{sub}"
return str(version) return str(version)
def encode_pass(self, password): def encode_pass(self, password):

3
app/config/version.json
View File

@ -1,6 +1,5 @@
{ {
"major": 4, "major": 4,
"minor": 0, "minor": 0,
"sub": 16, "sub": 16
"meta": "beta"
} }