From e5da3d0c0637ca6b391d6fd6bebea8a16e510807 Mon Sep 17 00:00:00 2001 From: Jeremy Green Date: Wed, 22 Nov 2023 14:00:44 -0600 Subject: [PATCH] resolve conflicts --- .github/workflows/_reusable_workflows.yml | 16 ------- .../workflows/ci-cd-pipeline-bt-internal.yml | 24 ---------- .github/workflows/ci-cd-pipeline-main.yml | 46 ++----------------- .github/workflows/ci-cd-pipeline.yml | 40 ---------------- 4 files changed, 3 insertions(+), 123 deletions(-) diff --git a/.github/workflows/_reusable_workflows.yml b/.github/workflows/_reusable_workflows.yml index 960cfdbf..c2dd5f6b 100644 --- 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 index 05d6efcc..b26329a1 100644 --- 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 index 8fbb1929..9c009b18 100644 --- a/.github/workflows/ci-cd-pipeline-main.yml +++ b/.github/workflows/ci-cd-pipeline-main.yml @@ -1,4 +1,3 @@ -<<<<<<< HEAD # This workflow will run whenever commits land on the main branch. # # It will run tests and a few safety checks. @@ -6,15 +5,15 @@ # 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 index 3aeebc1a..58feab54 100644 --- 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