diff --git a/.github/workflows/dockerhub-push.yml b/.github/workflows/dockerhub-push.yml index c831f43..7b162dd 100644 --- a/.github/workflows/dockerhub-push.yml +++ b/.github/workflows/dockerhub-push.yml @@ -22,6 +22,7 @@ jobs: - name: Get version run: | if [[ ${{ github.event_name }} == 'release' ]]; then + cargo generate-lockfile PKG_VERSION=$(cargo pkgid -p file://$(pwd)/overload | cut -d# -f2) TAG_VERSION=${GITHUB_REF:11} if [[ $PKG_VERSION != $TAG_VERSION ]]; then @@ -40,16 +41,17 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build cluster image + - name: Build & push standalone image uses: docker/build-push-action@v7 with: context: . + file: standalone.Dockerfile push: true - tags: ghcr.io/${{ github.repository }}:cluster-${{ env.version }}${{ env.suffix }} - - name: Build & push standalone image + tags: + ghcr.io/${{ github.repository }}:standalone-${{ env.version }}${{ env.suffix }} + - name: Build cluster image uses: docker/build-push-action@v7 with: context: . - file: standalone.Dockerfile push: true - tags: ghcr.io/${{ github.repository }}:standalone-${{ env.version }}${{ env.suffix }} + tags: ghcr.io/${{ github.repository }}:cluster-${{ env.version }}${{ env.suffix }} diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index d3ab20d..5de197e 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -23,7 +23,7 @@ jobs: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 @@ -44,7 +44,7 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v4 - name: Upload artifact - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-artifact@v7 with: path: 'docs/book/html' - name: Deploy to GitHub Pages