From 46e2a888c0ec49ee1a3442590cc689e0c7ff9483 Mon Sep 17 00:00:00 2001 From: Michael Bond Date: Sun, 8 Dec 2024 17:59:58 -0500 Subject: [PATCH 1/3] Rework branches --- .github/workflows/buildandtest.yml | 4 ++-- .github/workflows/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 50b46849..88f6a09e 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -3,10 +3,10 @@ name: Build and Test on: push: branches: - - main + - dev pull_request: branches: - - main + - dev jobs: build: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4fcc3444..239b7878 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Deploy to GitHub Pages on: push: branches: - - release + - main jobs: deploy: From 6de9b3f049e7958c4cbc563fd27fa02bd1376cd9 Mon Sep 17 00:00:00 2001 From: Michael Bond Date: Sun, 8 Dec 2024 21:41:36 -0500 Subject: [PATCH 2/3] Workflow tweaks --- .github/workflows/buildandtest.yml | 7 +++---- .github/workflows/main.yml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 88f6a09e..6d60c8a0 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -2,14 +2,13 @@ name: Build and Test on: push: - branches: - - dev + branches: [ "dev" ] pull_request: - branches: - - dev + branches: [ "dev" ] jobs: build: + name: "Build and Test" # use ubuntu-latest image to run steps on runs-on: ubuntu-latest diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 239b7878..b003621e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,11 +2,11 @@ name: Deploy to GitHub Pages on: push: - branches: - - main + branches: [ "main" ] jobs: deploy: + name: "Deploy to GitHub Pages" # use ubuntu-latest image to run steps on runs-on: ubuntu-latest steps: From 10e961267c2c2ee07169f5b250512de15bf8840a Mon Sep 17 00:00:00 2001 From: Michael Bond Date: Sun, 8 Dec 2024 21:53:04 -0500 Subject: [PATCH 3/3] Update buildandtest.yml --- .github/workflows/buildandtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml index 6d60c8a0..37971a89 100644 --- a/.github/workflows/buildandtest.yml +++ b/.github/workflows/buildandtest.yml @@ -4,7 +4,7 @@ on: push: branches: [ "dev" ] pull_request: - branches: [ "dev" ] + branches: [ "dev", "main" ] jobs: build: