diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 95ef5f3..73af0b0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ jobs: apps: ["order-service", "product-service", "store-front", "makeline-service", "store-admin"] runs-on: ubuntu-22.04 env: - HUMCTL_VERSION: '0.21.1' + HUMCTL_VERSION: '0.23.1' steps: - name: checkout code uses: actions/checkout@v3 @@ -23,7 +23,8 @@ jobs: run: | humctl score validate apps/${{ matrix.apps }}/score.yaml \ --token ${{ secrets.HUMANITEC_TOKEN }} \ - --org ${{ secrets.HUMANITEC_ORG }} + --org ${{ secrets.HUMANITEC_ORG }} \ + --strict score-compose: runs-on: ubuntu-22.04 env: diff --git a/Makefile b/Makefile index 5ef4a16..1805dba 100644 --- a/Makefile +++ b/Makefile @@ -43,4 +43,5 @@ humanitec-deploy: humctl score deploy \ --deploy-config apps/score.deploy.yaml \ --env ${HUMANITEC_ENVIRONMENT} \ - --app ${HUMANITEC_APPLICATION} \ No newline at end of file + --app ${HUMANITEC_APPLICATION} \ + --wait \ No newline at end of file diff --git a/apps/score.deploy.yaml b/apps/score.deploy.yaml index ad8424d..0d2076a 100644 --- a/apps/score.deploy.yaml +++ b/apps/score.deploy.yaml @@ -1,18 +1,13 @@ apiVersion: config.humanitec.io/v1b1 kind: ScoreDeployConfig workloads: - - name: store-demo/order-service - specFile: ./order-service/score.yaml + - specFile: ./order-service/score.yaml extensionsFile: ./order-service/humanitec.score.yaml - - name: store-demo/product-service - specFile: ./product-service/score.yaml + - specFile: ./product-service/score.yaml extensionsFile: ./product-service/humanitec.score.yaml - - name: store-demo/store-front - specFile: ./store-front/score.yaml + - specFile: ./store-front/score.yaml extensionsFile: ./store-front/humanitec.score.yaml - - name: store-demo/makeline-service - specFile: ./makeline-service/score.yaml + - specFile: ./makeline-service/score.yaml extensionsFile: ./makeline-service/humanitec.score.yaml - - name: store-demo/store-admin - specFile: ./store-admin/score.yaml + - specFile: ./store-admin/score.yaml extensionsFile: ./store-admin/humanitec.score.yaml \ No newline at end of file