improvement: merge workflows

Signed-off-by: Agustín Ramiro Díaz <[email protected]>
johanhelsing · Mar 28, 2024 · 1583749 · 1583749
1 parent 819beb6
commit 1583749
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 46 deletions.
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -75,7 +75,6 @@ jobs:
       - name: Run cargo clippy
         run: cargo fmt --all --check
 
-
   lint-native:
     name: Lints native
     strategy:
@@ -117,14 +116,14 @@ jobs:
 
       - name: Run cargo clippy
         run: RUSTFLAGS=--cfg=web_sys_unstable_apis cargo clippy >
-            --all-targets
-            --target wasm32-unknown-unknown
-            -p matchbox_socket
-            -p bevy_matchbox
-            -p bevy_ggrs_example
-            -p simple_example
-            --
-            -D warnings
+          --all-targets
+          --target wasm32-unknown-unknown
+          -p matchbox_socket
+          -p bevy_matchbox
+          -p bevy_ggrs_example
+          -p simple_example
+          --
+          -D warnings
 
   server-container:
     name: Build & Push Server Container
@@ -147,11 +146,19 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Docker Metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.IMAGE_REPOSITORY }}
+          images: |
+            ${{ env.IMAGE_REPOSITORY }}
+            ${{ vars.DOCKERHUB_USERNAME }}/matchbox_server
           tags: |
             type=ref,event=tag
             type=raw,value=latest

diff --git a/.github/workflows/push-matchbox_server-dockerhub.yml b/.github/workflows/push-matchbox_server-dockerhub.yml