From 0e16f9e1f2e32b118968dee649b07521da187728 Mon Sep 17 00:00:00 2001
From: "Mahadik, Mukul Chandrakant" <MukulChandrakant.Mahadik@nrel.gov>
Date: Thu, 25 Apr 2024 02:34:10 -0700
Subject: [PATCH] Upload artifact testing - 1

Removed testing set to execute on push to image-push-merge.
Testing whether artifacts are uploaded.
Skipping image build and push for test purposes.
---
 .github/workflows/image_build_push.yml        | 29 ++++++++++++++-----
 .github/workflows/test-with-docker.yml        |  4 +--
 .../workflows/test-with-manual-install.yml    | 12 ++++----
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml
index 3db336372..3d4f1a093 100644
--- a/.github/workflows/image_build_push.yml
+++ b/.github/workflows/image_build_push.yml
@@ -39,11 +39,24 @@ jobs:
       run: echo running in repo ${GITHUB_REPOSITORY#*/} branch ${GITHUB_REF##*/} on ${{ steps.date.outputs.date }}
 
     # Runs a set of commands using the runners shell
-    - name: build docker image
-      run: |
-        docker build -t $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }} .
-        docker images
-
-    - name: push docker image
-      run: |
-        docker push $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
+    # - name: build docker image
+    #   run: |
+    #     docker build -t $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }} .
+    #     docker images
+
+    # - name: push docker image
+    #   run: |
+    #     docker push $DOCKER_USER/${GITHUB_REPOSITORY#*/}:${GITHUB_REF##*/}_${{ steps.date.outputs.date }}
+
+
+	- name: Create a text file
+	run: |
+		echo "hello world" > tag_file.txt
+		echo "Created tag text file"
+
+	- name: Upload Artifact
+	uses: actions/upload-artifact@v4
+	with:
+		name: docker-image-tag
+		path: docker_tag.txt
+		overwrite: true
\ No newline at end of file
diff --git a/.github/workflows/test-with-docker.yml b/.github/workflows/test-with-docker.yml
index f5ae3e239..108dd62fa 100644
--- a/.github/workflows/test-with-docker.yml
+++ b/.github/workflows/test-with-docker.yml
@@ -6,9 +6,9 @@ name: test-with-docker
 # events but only for the master branch
 on:
   push:
-    branches: [ image-push-merge  ]
+    branches: [ master  ]
   pull_request:
-    branches: [ image-push-merge ]
+    branches: [ master ]
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '5 4 * * 0'
diff --git a/.github/workflows/test-with-manual-install.yml b/.github/workflows/test-with-manual-install.yml
index 62863e8e1..7212b9ebf 100644
--- a/.github/workflows/test-with-manual-install.yml
+++ b/.github/workflows/test-with-manual-install.yml
@@ -7,14 +7,14 @@ name: ubuntu-only-test-with-manual-install
 on:
   push:
     branches: 
-        # - master
-        # - gis-based-mode-detection
-        - image-push-merge
+        - master
+        - gis-based-mode-detection
+        # - image-push-merge
   pull_request:
     branches: 
-        # - master
-        # - gis-based-mode-detection
-        - image-push-merge
+        - master
+        - gis-based-mode-detection
+        # - image-push-merge
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron:  '5 4 * * 0'