Skip to content

Commit

Permalink
updated build script and build container v2.2 everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
curtisbowden committed Apr 22, 2024
1 parent be597ea commit 11e3912
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
19 changes: 12 additions & 7 deletions .devcontainer/build.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
#!/bin/bash

NAME=$(python -c 'print(eval(open("package").read())["name"])')
rm /omd/sites/cmk/var/check_mk/packages/* ||:
ln -s $WORKSPACE/package /omd/sites/cmk/var/check_mk/packages/$NAME
NAME=$(python3 -c 'print(eval(open("package").read())["name"])')
VERSION=$(python3 -c 'print(eval(open("package").read())["version"])')
rm -f $NAME-$VERSION.mkp \
/omd/sites/cmk/var/cat check_mk/packages/${NAME}-*.mkp \
/omd/sites/cmk/var/check_mk/packages_local/${NAME}-*.mkp ||:

mkp -v pack $NAME
mkp -v package package 2>&1 | sed '/Installing$/Q' ||:

cp /omd/sites/cmk/var/check_mk/packages_local/$NAME-$VERSION.mkp .

mkp inspect $NAME-$VERSION.mkp

# Set Outputs for GitHub Workflow steps
if [ -n "$GITHUB_WORKSPACE" ]; then
echo "pkgfile=$(ls *.mkp)" >> $GITHUB_OUTPUT
echo "pkgfile=${NAME}-${VERSION}.mkp" >> $GITHUB_OUTPUT
echo "pkgname=${NAME}" >> $GITHUB_OUTPUT
VERSION=$(python -c 'print(eval(open("package").read())["version"])')
echo "pkgversion=$VERSION" >> $GITHUB_OUTPUT
echo "pkgversion=$VERSION" >> $GITHUB_OUTPUT
fi
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Build Release Package
runs-on: ubuntu-latest
container:
image: checkmk/check-mk-raw:2.1.0-latest
image: checkmk/check-mk-raw:2.2.0-latest
permissions:
contents: write

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: Build Checkmk package
runs-on: ubuntu-latest
container:
image: checkmk/check-mk-raw:2.1.0-latest
image: checkmk/check-mk-raw:2.2.0-latest

env:
OMD_ROOT: /omd/sites/cmk
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: checkmk/check-mk-raw:2.1.0-latest
image: checkmk/check-mk-raw:2.2.0-latest

env:
OMD_ROOT: /omd/sites/cmk
Expand Down
2 changes: 1 addition & 1 deletion package
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
'title': 'Check based on ISIS-MIB for monitoring status.',
'version': '1.1.0',
'version.min_required': '2.0.0',
'version.packaged': '2.1.0',
'version.packaged': '2.2.0',
'version.usable_until': '2.3.0',
}

0 comments on commit 11e3912

Please sign in to comment.