resolve conflicts

bullet-train-co · Nov 22, 2023 · e5da3d0 · e5da3d0
1 parent 45bd773
commit e5da3d0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 123 deletions.
diff --git a/.github/workflows/_reusable_workflows.yml b/.github/workflows/_reusable_workflows.yml
@@ -1,18 +1,3 @@
-<<<<<<< HEAD
-# This is a dummy workflow that's just here to add a bit of organization to the workflow list.
-# Too bad they don't allow you to hide workflows or something.
-name: " 🚫 |----- Reusable Worfklows Below"
-on:
-  workflow_call:
-
-jobs:
-  nothing:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-||||||| 3ff18b8
-=======
 # This is a dummy workflow that's just here to add a bit of organization to the workflow list.
 # Too bad they don't allow you to hide workflows or something.
 name: " 🚫 |----- Reusable Worfklows Below"
@@ -24,4 +9,3 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "Nothing to see here. Move along. 🎇"
->>>>>>> v1.6.18
diff --git a/.github/workflows/ci-cd-pipeline-bt-internal.yml b/.github/workflows/ci-cd-pipeline-bt-internal.yml
@@ -1,26 +1,3 @@
-<<<<<<< HEAD
-# This workflow will run whenever a PR is opened or changed.
-#
-# It will run tests and a few safety checks.
-#
-# If everything passes it can be set to auto-deploy to your staging app on Heroku.
-#
-# This workflow is primarily meant to be triggered automatically, but it can be run manually.
-name: " 🚅 _ BT - Internal CI Pipeline"
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches: [ "main" ]
-
-jobs:
-  super_scaffolding:
-    name: 🏗️ Super Scaffolding Tests
-    uses: ./.github/workflows/_run_super_scaffolding_tests.yml
-    secrets: inherit
-||||||| 3ff18b8
-=======
 # This workflow will run whenever a PR is opened or changed.
 #
 # It will run tests and a few safety checks.
@@ -45,4 +22,3 @@ jobs:
     name: 🏗️ Super Scaffolding Tests
     uses: ./.github/workflows/_run_super_scaffolding_tests.yml
     secrets: inherit
->>>>>>> v1.6.18
diff --git a/.github/workflows/ci-cd-pipeline-main.yml b/.github/workflows/ci-cd-pipeline-main.yml
@@ -1,20 +1,19 @@
-<<<<<<< HEAD
 # This workflow will run whenever commits land on the main branch.
 #
 # It will run tests and a few safety checks.
 #
 # If everything passes it can be set to auto-deploy to your production app on Heroku.
 #
 # This workflow is primarily meant to be triggered automatically, but it can be run manually.
-name: " 🎥 Main CI/CD Pipeline (prod)"
+name: " 🎥 Main CI (prod)"
 on:
   workflow_dispatch:
   push:
     branches: [ "main" ]
 
 jobs:
-  mini_test:
-    name: 🧪 MiniTest
+  minitest:
+    name: 🧪 Minitest
     uses: ./.github/workflows/_run_tests.yml
     secrets: inherit
   standardrb:
@@ -35,42 +34,3 @@ jobs:
     secrets: inherit
     with:
       heroku-app-name: "bullettrain-co"
-||||||| 3ff18b8
-=======
-# This workflow will run whenever commits land on the main branch.
-#
-# It will run tests and a few safety checks.
-#
-# If everything passes it can be set to auto-deploy to your production app on Heroku.
-#
-# This workflow is primarily meant to be triggered automatically, but it can be run manually.
-name: " 🎥 Main CI (prod)"
-on:
-  workflow_dispatch:
-  push:
-    branches: [ "main" ]
-
-jobs:
-  minitest:
-    name: 🧪 Minitest
-    uses: ./.github/workflows/_run_tests.yml
-    secrets: inherit
-  standardrb:
-    name: 🔬 Standardrb
-    uses: ./.github/workflows/_standardrb.yml
-    secrets: inherit
-  db_schema:
-    name: 🔎 DB Schema
-    uses: ./.github/workflows/_database_schema_check.yml
-    secrets: inherit
-  # If you'd like to auto-deploy to your production environment you can uncomment this next block.
-  # You'll need to set HEROKU_EMAIL and HEROKU_API_KEY in your repo secrets.
-  # Be sure to set the app name correctly below.
-  # deploy:
-  #   name: 🚢 Deploy to Heroku
-  #   uses: ./.github/workflows/_deploy_heroku.yml
-  #   needs: [mini_test, standardrb, db_schema]
-  #   secrets: inherit
-  #   with:
-  #     heroku-app-name: ""
->>>>>>> v1.6.18
diff --git a/.github/workflows/ci-cd-pipeline.yml b/.github/workflows/ci-cd-pipeline.yml
@@ -1,42 +1,3 @@
-<<<<<<< HEAD
-# This workflow will run whenever a PR is opened or changed.
-#
-# It will run tests and a few safety checks.
-#
-# If everything passes it can be set to auto-deploy to your staging app on Heroku.
-#
-# This workflow is primarily meant to be triggered automatically, but it can be run manually.
-name: " 💻 PR CI/CD Pipeline (staging)"
-on:
-  workflow_dispatch:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  mini_test:
-    name: 🧪 MiniTest
-    uses: ./.github/workflows/_run_tests.yml
-    secrets: inherit
-  standardrb:
-    name: 🔬 Standardrb
-    uses: ./.github/workflows/_standardrb.yml
-    secrets: inherit
-  db_schema:
-    name: 🔎 DB Schema
-    uses: ./.github/workflows/_database_schema_check.yml
-    secrets: inherit
-  # If you'd like to auto-deploy to your staging environment you can uncomment this next block.
-  # You'll need to set HEROKU_EMAIL and HEROKU_API_KEY in your repo secrets.
-  # Be sure to set the app name correctly below.
-  # deploy:
-  #   name: 🚢 Deploy to Heroku
-  #   uses: ./.github/workflows/_deploy_heroku.yml
-  #   needs: [mini_test, standardrb, db_schema]
-  #   secrets: inherit
-  #   with:
-  #     heroku-app-name: ""
-||||||| 3ff18b8
-=======
 # This workflow will run whenever a PR is opened or changed.
 #
 # It will run tests and a few safety checks.
@@ -73,4 +34,3 @@ jobs:
   #   secrets: inherit
   #   with:
   #     heroku-app-name: ""
->>>>>>> v1.6.18