diff --git a/.github/workflows/partial-publish.yaml b/.github/workflows/partial-publish.yaml index 4b4db42..48e9f5a 100644 --- a/.github/workflows/partial-publish.yaml +++ b/.github/workflows/partial-publish.yaml @@ -48,7 +48,7 @@ jobs: if: ${{ inputs.release == false }} run: | docker build --push --no-cache \ - --tag=ghcr.io/hay-kot/homebox:nightly \ + --tag=ghcr.io/hay-kot/homebox:${{ inputs.tag }} \ --build-arg=COMMIT=$(git rev-parse HEAD) \ --build-arg=BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --platform=linux/amd64,linux/arm64,linux/arm/v7 . @@ -59,7 +59,7 @@ jobs: docker build --push --no \ --tag ghcr.io/hay-kot/homebox:nightly \ --tag ghcr.io/hay-kot/homebox:latest \ - --tag ghcr.io/hay-kot/homebox:{{ inputs.tag }} \ + --tag ghcr.io/hay-kot/homebox:${{ inputs.tag }} \ --build-arg COMMIT=$(git rev-parse HEAD) \ --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --platform linux/amd64,linux/arm64,linux/arm/v7 . diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 9e89776..1391068 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -12,31 +12,31 @@ env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} jobs: - # backend-tests: - # name: "Backend Server Tests" - # uses: hay-kot/homebox/.github/workflows/partial-backend.yaml@main + backend-tests: + name: "Backend Server Tests" + uses: hay-kot/homebox/.github/workflows/partial-backend.yaml@main - # frontend-tests: - # name: "Frontend and End-to-End Tests" - # uses: hay-kot/homebox/.github/workflows/partial-frontend.yaml@main + frontend-tests: + name: "Frontend and End-to-End Tests" + uses: hay-kot/homebox/.github/workflows/partial-frontend.yaml@main - # deploy: - # name: "Deploy Nightly to Fly.io" - # runs-on: ubuntu-latest - # needs: - # - backend-tests - # - frontend-tests - # steps: - # - uses: actions/checkout@v2 - # - uses: superfly/flyctl-actions/setup-flyctl@master - # - run: flyctl deploy --remote-only + deploy: + name: "Deploy Nightly to Fly.io" + runs-on: ubuntu-latest + needs: + - backend-tests + - frontend-tests + steps: + - uses: actions/checkout@v2 + - uses: superfly/flyctl-actions/setup-flyctl@master + - run: flyctl deploy --remote-only publish-nightly: name: "Publish Nightly" if: ${{ github.event_name != 'release' }} - # needs: - # - backend-tests - # - frontend-tests + needs: + - backend-tests + - frontend-tests uses: hay-kot/homebox/.github/workflows/partial-publish.yaml@main with: tag: nightly @@ -46,9 +46,9 @@ jobs: publish-tag: name: "Publish Tag" if: github.event_name == 'release' - # needs: - # - backend-tests - # - frontend-tests + needs: + - backend-tests + - frontend-tests uses: hay-kot/homebox/.github/workflows/partial-publish.yaml@main with: release: true