Skip to content

Commit 89a82ad

Browse files
kitsudaikikitsudaiki
committed
WIP
Signed-off-by: Tobias Anker <tobias.anker@kitsunemimi.moe>
1 parent 762cd9d commit 89a82ad

22 files changed

Lines changed: 388 additions & 392 deletions

File tree

‎.github/workflows/build_test.yml‎

Lines changed: 138 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ permissions:
99
env:
1010
REGISTRY_HANAMI_IMAGE: kitsudaiki/hanami
1111
REGISTRY_DOCS_IMAGE: kitsudaiki/openhanami_docs
12-
HANAMI_ADMIN_USER_ID: asdf
13-
HANAMI_ADMIN_USER_NAME: asdf
12+
HANAMI_ADMIN_ID: asdf
13+
HANAMI_ADMIN_NAME: asdf
1414
HANAMI_ADMIN_PASSPHRASE: asdfasdf
1515

1616
jobs:
@@ -543,18 +543,15 @@ jobs:
543543
544544
545545
sdk_api_tests:
546-
# TODO: re-enable tests again
547-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
548-
549546
name: "SDK-API-Tests"
550547
needs: [ cargo_tests, unit_tests, memory_leak_tests ]
551-
runs-on: ubuntu-22.04
548+
runs-on: ubuntu-24.04
552549
steps:
553550
-
554551
name: Install dependencies
555552
run: |
556553
sudo apt-get update
557-
sudo apt-get install -y openssl libuuid1 libcrypto++8 libsqlite3-0 libprotobuf23 libboost1.74
554+
sudo apt-get install -y openssl libsqlite3-0
558555
-
559556
name: Set python-version as environment variable
560557
run: |
@@ -634,18 +631,15 @@ jobs:
634631
635632
636633
cli_api_tests:
637-
# TODO: re-enable tests again
638-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
639-
640634
name: "CLI-API-Tests"
641635
needs: [ cargo_tests, unit_tests, memory_leak_tests ]
642-
runs-on: ubuntu-22.04
636+
runs-on: ubuntu-24.04
643637
steps:
644638
-
645639
name: Install dependencies
646640
run: |
647641
sudo apt-get update
648-
sudo apt-get install -y openssl libuuid1 libcrypto++8 libsqlite3-0 libprotobuf23 libboost1.74
642+
sudo apt-get install -y openssl libsqlite3-0
649643
-
650644
name: Checkout repository
651645
run: |
@@ -718,7 +712,7 @@ jobs:
718712
719713
720714
python_version_test:
721-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
715+
# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
722716
needs: [ cargo_tests, unit_tests, memory_leak_tests ]
723717
strategy:
724718
fail-fast: false
@@ -818,8 +812,8 @@ jobs:
818812
./example_configs/openhanami:/etc/openhanami \
819813
-p 127.0.0.1:11418:11418 \
820814
--name=hanami \
821-
--env HANAMI_ADMIN_USER_ID=asdf \
822-
--env HANAMI_ADMIN_USER_NAME=asdf \
815+
--env HANAMI_ADMIN_ID=asdf \
816+
--env HANAMI_ADMIN_NAME=asdf \
823817
--env HANAMI_ADMIN_PASSPHRASE=asdfasdf \
824818
kitsudaiki/hanami:test
825819
-
@@ -846,15 +840,15 @@ jobs:
846840

847841
docker_build:
848842
name: "Build Docker-images"
849-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
843+
# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
850844
needs: [ sdk_api_tests, cli_api_tests ]
851-
runs-on: ubuntu-22.04
845+
runs-on: ubuntu-24.04
852846
strategy:
853847
fail-fast: false
854848
matrix:
855849
platform:
856850
- linux/amd64
857-
- linux/arm64
851+
# - linux/arm64
858852
steps:
859853
-
860854
name: Prepare
@@ -927,8 +921,8 @@ jobs:
927921

928922
docker_merge:
929923
name: "Merge and push Docker-image"
930-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
931-
runs-on: ubuntu-22.04
924+
# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
925+
runs-on: ubuntu-24.04
932926
needs: [ docker_build ]
933927
steps:
934928
-
@@ -1167,55 +1161,57 @@ jobs:
11671161

11681162

11691163

1170-
badge-upload:
1171-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' && always() }}
1172-
needs: [ kubernetes_test, python_version_test, compiler_test ]
1173-
runs-on: ubuntu-22.04
1174-
name: Publish badges
1175-
steps:
1176-
-
1177-
name: Set branch name as environment variable
1178-
run: |
1179-
if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1180-
echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1181-
else \
1182-
echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
1183-
fi
1184-
-
1185-
name: Checkout repository
1186-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
1187-
-
1188-
name: Publish Compiler Badges
1189-
uses: ./.github/actions/badge
1190-
with:
1191-
category: compiler_version
1192-
badges: ${{ toJson(needs.compiler_test.outputs) }}
1193-
github_token: ${{ secrets.BADGES_PUSH_TOKEN }}
1194-
branch_name: ${{ env.BRANCH_NAME }}
1195-
-
1196-
name: Publish Python Badges
1197-
uses: ./.github/actions/badge
1198-
with:
1199-
category: python_version
1200-
badges: ${{ toJson(needs.python_version_test.outputs) }}
1201-
github_token: ${{ secrets.BADGES_PUSH_TOKEN }}
1202-
branch_name: ${{ env.BRANCH_NAME }}
1203-
-
1204-
name: Publish Kubernetes Badges
1205-
uses: ./.github/actions/badge
1206-
with:
1207-
category: kubernetes_version
1208-
badges: ${{ toJson(needs.kubernetes_test.outputs) }}
1209-
github_token: ${{ secrets.BADGES_PUSH_TOKEN }}
1210-
branch_name: ${{ env.BRANCH_NAME }}
1164+
# badge-upload:
1165+
# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' && always() }}
1166+
# # needs: [ kubernetes_test, python_version_test, compiler_test ]
1167+
# needs: [ compiler_test ]
1168+
# runs-on: ubuntu-22.04
1169+
# name: Publish badges
1170+
# steps:
1171+
# -
1172+
# name: Set branch name as environment variable
1173+
# run: |
1174+
# if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1175+
# echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1176+
# else \
1177+
# echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
1178+
# fi
1179+
# -
1180+
# name: Checkout repository
1181+
# uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
1182+
# -
1183+
# name: Publish Compiler Badges
1184+
# uses: ./.github/actions/badge
1185+
# with:
1186+
# category: compiler_version
1187+
# badges: ${{ toJson(needs.compiler_test.outputs) }}
1188+
# github_token: ${{ secrets.BADGES_PUSH_TOKEN }}
1189+
# branch_name: ${{ env.BRANCH_NAME }}
1190+
# -
1191+
# name: Publish Python Badges
1192+
# uses: ./.github/actions/badge
1193+
# with:
1194+
# category: python_version
1195+
# badges: ${{ toJson(needs.python_version_test.outputs) }}
1196+
# github_token: ${{ secrets.BADGES_PUSH_TOKEN }}
1197+
# branch_name: ${{ env.BRANCH_NAME }}
1198+
# -
1199+
# name: Publish Kubernetes Badges
1200+
# uses: ./.github/actions/badge
1201+
# with:
1202+
# category: kubernetes_version
1203+
# badges: ${{ toJson(needs.kubernetes_test.outputs) }}
1204+
# github_token: ${{ secrets.BADGES_PUSH_TOKEN }}
1205+
# branch_name: ${{ env.BRANCH_NAME }}
12111206

12121207

12131208

12141209
build_docs:
12151210
name: Build and push docs
1216-
needs: [ kubernetes_test ]
1211+
# needs: [ kubernetes_test ]
1212+
needs: [ docker_merge ]
12171213
runs-on: ubuntu-latest
1218-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
1214+
# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
12191215
env:
12201216
FORCE_COLOR: 1
12211217
steps:
@@ -1261,82 +1257,82 @@ jobs:
12611257

12621258

12631259

1264-
upload_files:
1265-
name: "Upload files to share"
1266-
needs: [ kubernetes_test ]
1267-
runs-on: ubuntu-latest
1268-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
1269-
env:
1270-
FORCE_COLOR: 1
1271-
steps:
1272-
-
1273-
name: Set branch name as environment variable
1274-
run: |
1275-
if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1276-
echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1277-
else \
1278-
echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
1279-
fi
1280-
-
1281-
name: Set helm-version as environment variable
1282-
run: |
1283-
if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1284-
echo "HELM_VERSION=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1285-
else \
1286-
echo "HELM_VERSION=0.0.0" | sed 's#/#\-#' >> $GITHUB_ENV; \
1287-
fi
1288-
-
1289-
name: Set python-version as environment variable
1290-
run: |
1291-
if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1292-
echo "PYTHON_PACKAGE_VERSION=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1293-
else \
1294-
echo "PYTHON_PACKAGE_VERSION=0.0.0" | sed 's#/#\-#' >> $GITHUB_ENV; \
1295-
fi
1296-
-
1297-
name: Get artifact
1298-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
1299-
with:
1300-
name: hanamictl_build_result
1301-
path: /tmp/hanamictl_build_result
1302-
-
1303-
name: Get helm-chart artifact
1304-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
1305-
with:
1306-
name: hanami_helm_build_result
1307-
path: /tmp/hanami_helm_build_result
1308-
-
1309-
name: Get artifact
1310-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
1311-
with:
1312-
name: hanami_python_build_result
1313-
path: /tmp/hanami_python_build_result
1314-
-
1315-
name: Prepare ssh-keys
1316-
run: |
1317-
mkdir -p ~/.ssh
1318-
echo "${{ secrets.SHARE_SSH_PUBLIC_KEY }}" > ~/.ssh/id_rsa.pub
1319-
echo "${{ secrets.SHARE_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
1320-
echo "${{ secrets.SHARE_SSH_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
1321-
chmod 600 ~/.ssh/id_rsa
1322-
-
1323-
name: Create remote directory, if not exist
1324-
run: |
1325-
ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME"
1326-
ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME/helm-chart"
1327-
ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME/python-package"
1328-
ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME/client"
1329-
-
1330-
name: Upload hanamictl
1331-
run: |
1332-
cd /tmp/hanamictl_build_result
1333-
tar -czvf hanamictl_amd64_$BRANCH_NAME.tar.gz hanamictl
1334-
scp hanamictl_amd64_$BRANCH_NAME.tar.gz ${{ secrets.SHARE_SSH_ACCESS }}:~/hanami_file_share/$BRANCH_NAME/client/
1335-
-
1336-
name: Upload helm-chart
1337-
run: |
1338-
scp /tmp/hanami_helm_build_result/openhanami-$HELM_VERSION.tgz ${{ secrets.SHARE_SSH_ACCESS }}:~/hanami_file_share/$BRANCH_NAME/helm-chart/
1339-
-
1340-
name: Upload pip-package
1341-
run: |
1342-
scp /tmp/hanami_python_build_result/hanami_sdk-$PYTHON_PACKAGE_VERSION-py2.py3-none-any.whl ${{ secrets.SHARE_SSH_ACCESS }}:~/hanami_file_share/$BRANCH_NAME/python-package/
1260+
# upload_files:
1261+
# name: "Upload files to share"
1262+
# needs: [ kubernetes_test ]
1263+
# runs-on: ubuntu-latest
1264+
# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' || github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
1265+
# env:
1266+
# FORCE_COLOR: 1
1267+
# steps:
1268+
# -
1269+
# name: Set branch name as environment variable
1270+
# run: |
1271+
# if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1272+
# echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1273+
# else \
1274+
# echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" | sed 's#/#\-#' >> $GITHUB_ENV; \
1275+
# fi
1276+
# -
1277+
# name: Set helm-version as environment variable
1278+
# run: |
1279+
# if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1280+
# echo "HELM_VERSION=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1281+
# else \
1282+
# echo "HELM_VERSION=0.0.0" | sed 's#/#\-#' >> $GITHUB_ENV; \
1283+
# fi
1284+
# -
1285+
# name: Set python-version as environment variable
1286+
# run: |
1287+
# if [[ ${GITHUB_REF#} == refs/tags/* ]]; then \
1288+
# echo "PYTHON_PACKAGE_VERSION=$(echo ${GITHUB_REF#refs/tags/} | sed 's/^v//')" | sed 's#/#\-#' >> $GITHUB_ENV; \
1289+
# else \
1290+
# echo "PYTHON_PACKAGE_VERSION=0.0.0" | sed 's#/#\-#' >> $GITHUB_ENV; \
1291+
# fi
1292+
# -
1293+
# name: Get artifact
1294+
# uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
1295+
# with:
1296+
# name: hanamictl_build_result
1297+
# path: /tmp/hanamictl_build_result
1298+
# -
1299+
# name: Get helm-chart artifact
1300+
# uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
1301+
# with:
1302+
# name: hanami_helm_build_result
1303+
# path: /tmp/hanami_helm_build_result
1304+
# -
1305+
# name: Get artifact
1306+
# uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
1307+
# with:
1308+
# name: hanami_python_build_result
1309+
# path: /tmp/hanami_python_build_result
1310+
# -
1311+
# name: Prepare ssh-keys
1312+
# run: |
1313+
# mkdir -p ~/.ssh
1314+
# echo "${{ secrets.SHARE_SSH_PUBLIC_KEY }}" > ~/.ssh/id_rsa.pub
1315+
# echo "${{ secrets.SHARE_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
1316+
# echo "${{ secrets.SHARE_SSH_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
1317+
# chmod 600 ~/.ssh/id_rsa
1318+
# -
1319+
# name: Create remote directory, if not exist
1320+
# run: |
1321+
# ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME"
1322+
# ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME/helm-chart"
1323+
# ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME/python-package"
1324+
# ssh ${{ secrets.SHARE_SSH_ACCESS }} "mkdir -p ~/hanami_file_share/$BRANCH_NAME/client"
1325+
# -
1326+
# name: Upload hanamictl
1327+
# run: |
1328+
# cd /tmp/hanamictl_build_result
1329+
# tar -czvf hanamictl_amd64_$BRANCH_NAME.tar.gz hanamictl
1330+
# scp hanamictl_amd64_$BRANCH_NAME.tar.gz ${{ secrets.SHARE_SSH_ACCESS }}:~/hanami_file_share/$BRANCH_NAME/client/
1331+
# -
1332+
# name: Upload helm-chart
1333+
# run: |
1334+
# scp /tmp/hanami_helm_build_result/openhanami-$HELM_VERSION.tgz ${{ secrets.SHARE_SSH_ACCESS }}:~/hanami_file_share/$BRANCH_NAME/helm-chart/
1335+
# -
1336+
# name: Upload pip-package
1337+
# run: |
1338+
# scp /tmp/hanami_python_build_result/hanami_sdk-$PYTHON_PACKAGE_VERSION-py2.py3-none-any.whl ${{ secrets.SHARE_SSH_ACCESS }}:~/hanami_file_share/$BRANCH_NAME/python-package/

0 commit comments

Comments
 (0)