update the github actions

HEM-Inc · Nov 20, 2024 · 91728ea · 91728ea
1 parent 382578e
commit 91728ea
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
@@ -4,7 +4,7 @@ on:
   push:
     # Publish `main` as Docker `latest` image.
     # branches:
-      # - "main"
+    # - "main"
 
     # Publish `2.1.2.3` tags as releases.
     tags:
@@ -22,28 +22,22 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v3 
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: create version
+      - name: create version
         run: |
           echo "VERSION=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
           echo "MAJOR_VERSION=$(echo ${{ github.ref_name }} | sed -E 's/^([0-9]+)\.([0-9]+)\..+/\1.\2/')" >> $GITHUB_ENV
-      -
-        name: Build and push
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -56,7 +50,6 @@ jobs:
           # push to docker hub
           push: true
 
-
       # steps:
       #   - name: Build and push Docker images
       #     uses: docker/build-push-action@v2.5.0
diff --git a/.github/workflows/dockertest.yml b/.github/workflows/dockertest.yml
@@ -17,34 +17,28 @@ on:
   # workflow_dispatch:
 
 env:
-  app: ods
+  app: mtconnect
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v3 
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: create version
+      - name: create version
         run: |
           echo "VERSION=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
           echo "MAJOR_VERSION=$(echo ${{ github.ref_name }} | sed -E 's/^([0-9]+)\.([0-9]+)\..+/\1.\2/')" >> $GITHUB_ENV
-      -
-        name: Build and push
+      - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -55,7 +49,6 @@ jobs:
           # push to docker hub
           push: true
 
-
       # steps:
       #   - name: Build and push Docker images
       #     uses: docker/build-push-action@v2.5.0