From 9b4fd2c6f42059c5e83b9018c6e1c5eb2e75f9cf Mon Sep 17 00:00:00 2001
From: DataHearth <antoine.l@antoine-langlois.net>
Date: Fri, 23 Jun 2023 16:35:02 +0200
Subject: [PATCH] update workflows

---
 .../{container.yaml => container.yml}          |  2 +-
 .gitea/workflows/{rust.yaml => rust.yml}       |  2 +-
 .github/{workflow => workflows}/container.yml  | 18 +++++-------------
 .github/{workflow => workflows}/rust.yml       | 11 +++++------
 4 files changed, 12 insertions(+), 21 deletions(-)
 rename .gitea/workflows/{container.yaml => container.yml} (96%)
 rename .gitea/workflows/{rust.yaml => rust.yml} (94%)
 rename .github/{workflow => workflows}/container.yml (60%)
 rename .github/{workflow => workflows}/rust.yml (64%)

diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yml
similarity index 96%
rename from .gitea/workflows/container.yaml
rename to .gitea/workflows/container.yml
index e13f5cc..c3a2825 100644
--- a/.gitea/workflows/container.yaml
+++ b/.gitea/workflows/container.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v2
 
       - name: Log into registry Docker
         uses: docker/login-action@v2
diff --git a/.gitea/workflows/rust.yaml b/.gitea/workflows/rust.yml
similarity index 94%
rename from .gitea/workflows/rust.yaml
rename to .gitea/workflows/rust.yml
index be6dd87..e7a80d3 100644
--- a/.gitea/workflows/rust.yaml
+++ b/.gitea/workflows/rust.yml
@@ -23,5 +23,5 @@ jobs:
           toolchain: stable
           profile: minimal
 
-      - name: Test
+      - name: Run tests
         run: cargo test --verbose
diff --git a/.github/workflow/container.yml b/.github/workflows/container.yml
similarity index 60%
rename from .github/workflow/container.yml
rename to .github/workflows/container.yml
index 36eb140..26c21e6 100644
--- a/.github/workflow/container.yml
+++ b/.github/workflows/container.yml
@@ -11,28 +11,20 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v2
 
-      - name: Log into registry Docker
+      - name: Log into registry GitHub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Log into registry Gitea
-        uses: docker/login-action@v2
-        with:
-          registry: gitea.antoine-langlois.net
+          registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
+          password: ${{ secrets.GH_TOKEN }}
 
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: |
-            datahearth/tech-bot
-            gitea.antoine-langlois.net/datahearth/tech-bot
+          images: ${{ github.repository_owner }}/${{ github.repository }}
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
diff --git a/.github/workflow/rust.yml b/.github/workflows/rust.yml
similarity index 64%
rename from .github/workflow/rust.yml
rename to .github/workflows/rust.yml
index 8621a94..8ef5a62 100644
--- a/.github/workflow/rust.yml
+++ b/.github/workflows/rust.yml
@@ -2,21 +2,20 @@ name: Rust
 
 on:
   push:
-    branches: ["main"]
+    branches:
+      - "main"
   pull_request:
-    branches: ["main"]
+    branches:
+      - "main"
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  test-build:
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
-      - name: Build
-        run: cargo build --verbose
-
       - name: Run tests
         run: cargo test --verbose