From 678dc46916844be86718027da487ab3d8b879339 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Fri, 21 Jul 2023 11:37:25 -0700
Subject: [PATCH] build debugging

---
 .dockerignore                          |  5 ++---
 .github/workflows/build-base.yaml      | 18 ------------------
 .github/workflows/build-test-lint.yaml |  2 +-
 .gitignore                             |  1 +
 docker-compose.yml                     |  1 -
 hyrax-webapp                           |  2 +-
 6 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/build-base.yaml

diff --git a/.dockerignore b/.dockerignore
index eb41796..5e4ec4e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,7 +16,6 @@
 .coveralls.yml
 .ebextensions
 .fcrepo_wrapper
-.github
 .hound.yml
 .idea
 .internal_test_app/*
@@ -26,6 +25,6 @@ node_modules/*
 solr/solr/*
 fcrpo/*
 pg/*
-Dockerfile*
 fits.log
-ImageMagick*
\ No newline at end of file
+ImageMagick*
+.DS_Store
diff --git a/.github/workflows/build-base.yaml b/.github/workflows/build-base.yaml
deleted file mode 100644
index b8b16bd..0000000
--- a/.github/workflows/build-base.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: "Build Base"
-run-name: Build Base of ${{ github.ref_name }} by @${{ github.actor }}
-on:
-  workflow_dispatch:
-    inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
-        required: false
-        default: false
-
-jobs:
-  build:
-    uses: scientist-softserv/actions/.github/workflows/build.yaml@make_actions_more_like_local
-    secrets: inherit
-    with:
-      platforms: "linux/amd64"
-      baseTarget: hyku-base
diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml
index 599b9b4..fcf10f7 100644
--- a/.github/workflows/build-test-lint.yaml
+++ b/.github/workflows/build-test-lint.yaml
@@ -13,7 +13,7 @@ on:
         type: boolean
         description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
         required: false
-        default: false
+        default: true
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
index cdde4a1..7121866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 scratch.md
 *~undo-tree~
 .env.*
+.DS_Store
diff --git a/docker-compose.yml b/docker-compose.yml
index 85e408a..e96a83c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,6 @@ x-app: &app
     - cache:/app/samvera/hyrax-webapp/tmp/cache:cached
     - .:/app/samvera
 
-
 volumes:
   assets:
   cache:
diff --git a/hyrax-webapp b/hyrax-webapp
index 8301c89..e4b097e 160000
--- a/hyrax-webapp
+++ b/hyrax-webapp
@@ -1 +1 @@
-Subproject commit 8301c8961bf01ed582e6a1d7dadb02dba1387626
+Subproject commit e4b097e07c9078692471da4f8531afa858a8ba26