diff --git a/.github/workflows/spacebar-client-docker-pull-requessts.yml b/.github/workflows/spacebar-client-docker-pull-requessts.yml index c9d2fe3..cea02f9 100644 --- a/.github/workflows/spacebar-client-docker-pull-requessts.yml +++ b/.github/workflows/spacebar-client-docker-pull-requessts.yml @@ -2,30 +2,24 @@ name: Dry-run build for PRs - client on: pull_request: - branches: [ "master" ] + branches: ["master"] jobs: - build-amd64: runs-on: [x64] needs: build-arm64 steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-client/" @@ -34,8 +28,7 @@ jobs: push: false tags: spacebarchat/client:latest-amd64 provenance: false - - - name: Create and push manifest images + - name: Create and push manifest images uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab with: inputs: spacebarchat/client:latest @@ -46,22 +39,17 @@ jobs: build-arm64: runs-on: [ARM64] steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push armv7 + - name: Build and push armv7 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-client/" @@ -70,8 +58,7 @@ jobs: push: false tags: spacebarchat/client:latest-armv7 provenance: false - - - name: Build and push arm64 + - name: Build and push arm64 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:client/" diff --git a/.github/workflows/spacebar-client-docker.yml b/.github/workflows/spacebar-client-docker.yml index 3402403..868ee99 100644 --- a/.github/workflows/spacebar-client-docker.yml +++ b/.github/workflows/spacebar-client-docker.yml @@ -2,30 +2,24 @@ name: Build spacebar client docker image on: push: - branches: [ "master", "rewrite" ] + branches: ["master", "rewrite"] jobs: - build-amd64: runs-on: [x64] needs: build-arm64 steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-client/" @@ -34,8 +28,7 @@ jobs: push: true tags: spacebarchat/client:latest-amd64 provenance: false - - - name: Create and push manifest images + - name: Create and push manifest images uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab with: inputs: spacebarchat/client:latest @@ -46,22 +39,17 @@ jobs: build-arm64: runs-on: [ARM64] steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push armv7 + - name: Build and push armv7 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-client/" @@ -70,8 +58,7 @@ jobs: push: true tags: spacebarchat/client:latest-armv7 provenance: false - - - name: Build and push arm64 + - name: Build and push arm64 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-client/" diff --git a/.github/workflows/spacebar-server-docker-pull-requests.yml b/.github/workflows/spacebar-server-docker-pull-requests.yml index a288560..f8174f9 100644 --- a/.github/workflows/spacebar-server-docker-pull-requests.yml +++ b/.github/workflows/spacebar-server-docker-pull-requests.yml @@ -2,31 +2,24 @@ name: Check pull request Server on: pull_request: - branches: [ "master" ] - + branches: ["master"] jobs: - build-amd64: runs-on: [x64] needs: build-arm64 steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push with postgressql + - name: Build and push with postgressql uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:server/" @@ -35,8 +28,7 @@ jobs: push: false tags: spacebarchat/server:latest-postgressql-amd64 provenance: false - - - name: Build and push with sqlite + - name: Build and push with sqlite uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/" @@ -44,17 +36,14 @@ jobs: push: false tags: spacebarchat/server:latest-sqlite-amd64 provenance: false - - - - name: Create and push manifest images postgressql + - name: Create and push manifest images postgressql uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab with: inputs: spacebarchat/server:latest-postgressql images: spacebarchat/server:latest-postgressql-amd64,spacebarchat/server:latest-postgressql-arm64 push: false amend: true - - - name: Create and push manifest images sqlite + - name: Create and push manifest images sqlite uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab with: inputs: spacebarchat/server:latest-sqlite @@ -65,22 +54,17 @@ jobs: build-arm64: runs-on: [ARM64] steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push with sqlite arm64 + - name: Build and push with sqlite arm64 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/" @@ -89,8 +73,7 @@ jobs: push: false tags: spacebarchat/server:latest-sqlite-arm64 provenance: false - - - name: Build and push with postgressql arm64 + - name: Build and push with postgressql arm64 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/" diff --git a/.github/workflows/spacebar-server-docker.yml b/.github/workflows/spacebar-server-docker.yml index 238ca26..86b552c 100644 --- a/.github/workflows/spacebar-server-docker.yml +++ b/.github/workflows/spacebar-server-docker.yml @@ -2,30 +2,24 @@ name: Build spacebar Server docker image on: push: - branches: [ "master", "rewrite" ] + branches: ["master", "rewrite"] jobs: - build-amd64: runs-on: [x64] needs: build-arm64 steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push with postgressql + - name: Build and push with postgressql uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/" @@ -34,8 +28,7 @@ jobs: push: true tags: spacebarchat/server:latest-postgressql-amd64 provenance: false - - - name: Build and push with sqlite + - name: Build and push with sqlite uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/" @@ -43,17 +36,14 @@ jobs: push: true tags: spacebarchat/server:latest-sqlite-amd64 provenance: false - - - - name: Create and push manifest images postgressql + - name: Create and push manifest images postgressql uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab with: inputs: spacebarchat/server:latest-postgressql images: spacebarchat/server:latest-postgressql-amd64,spacebarchat/server:latest-postgressql-arm64 push: true amend: true - - - name: Create and push manifest images sqlite + - name: Create and push manifest images sqlite uses: Noelware/docker-manifest-action@master # or use a pinned version in the Releases tab with: inputs: spacebarchat/server:latest-sqlite @@ -64,22 +54,17 @@ jobs: build-arm64: runs-on: [ARM64] steps: - - - uses: actions/checkout@v3 - - - name: Set up QEMU + - uses: actions/checkout@v3 + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_SPACEBAR_USERNAME }} password: ${{ secrets.DOCKERHUB_SPACEBAR_TOKEN }} - - - name: Build and push with sqlite arm64 + - name: Build and push with sqlite arm64 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/" @@ -88,8 +73,7 @@ jobs: push: true tags: spacebarchat/server:latest-sqlite-arm64 provenance: false - - - name: Build and push with postgressql arm64 + - name: Build and push with postgressql arm64 uses: docker/build-push-action@v4 with: context: "{{defaultContext}}:spacebar-server/"