Merge pull request #5 from PaperMtn/develop

Version 2.0.0 Release

.github/workflows/dockerpublish.yml

@@ -1,33 +1,30 @@
-name: Publish Docker image
+name: ci
 
 on:
-  release:
-    types: [published]
+  push:
+    branches: [ main ]
 
 jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
+  build:
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
+      -
+        name: Checkout
         uses: actions/checkout@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
-          images: my-docker-hub-namespace/my-docker-hub-repository
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
         with:
           context: .
+          file: ./Dockerfile
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/slack-watchman-eg:latest

.github/workflows/github_release.yml

@@ -3,8 +3,6 @@ name: Create Release
 on:
   push:
     branches: [ main ]
-  pull_request:
-    branches: [ main ]
 
 jobs:
   build:
@@ -50,4 +48,5 @@ jobs:
         with:
           artifacts: "dist/*.tar.gz"
           body: ${{ steps.extract-release-notes.outputs.release_notes }}
-          tag: ${{ steps.version.outputs.TAG_NAME }}
+          tag: ${{ steps.version.outputs.TAG_NAME }}
+          name: Slack Watchman for Enterprise Grid - ${{ steps.version.outputs.TAG_NAME }}

.github/workflows/pythonpublish.yml

@@ -4,8 +4,8 @@
 name: Upload Python Package
 
 on:
-  release:
-    types: [published]
+  push:
+    branches: [ main ]
 
 jobs:
   deploy: