From ebeab802f03e4158764f26e61880dfa4f3feb940 Mon Sep 17 00:00:00 2001
From: Josh Faigan <djjoker13@gmail.com>
Date: Sat, 30 Sep 2023 22:46:52 -0400
Subject: [PATCH] workflow changes

---
 .github/workflows/ci-build.yml | 4 +++-
 .github/workflows/ci-test.yml  | 3 ++-
 dc-swarm.yml                   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index c5140e3..212bbc2 100644
--- 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}
\ No newline at end of file
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 1a8e3b7..957e1a0 100644
--- 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
index 7cc7452..1cb67e4 100644
--- 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: