Merge pull request #8 from EvilGenius13/EG-workflow

workflow changes
EvilGenius13 · Oct 1, 2023 · 073a77e · 073a77e
2 parents 1ab3dea + ebeab80
commit 073a77e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -59,8 +59,10 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Set DOCKER_TAG to main
+      run: echo "DOCKER_TAG=main" >> $GITHUB_ENV
+
     - name: Build and push Docker image
       run: |
-        echo "DOCKER_TAG=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
         docker build -t evilgenius13/pokeapp:${DOCKER_TAG} .
         docker push evilgenius13/pokeapp:${DOCKER_TAG}
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -1,6 +1,7 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  pull_request:
 
 jobs:
   test:

diff --git a/dc-swarm.yml b/dc-swarm.yml
@@ -1,3 +1,4 @@
+# App Version: 2.3
 version: '3.8'  # Newer Docker Compose version. This is a deployment config for portainer with docker swarm. It pulls from the github repo.
 
 volumes: