From ef58434cfd2ff07bbfee006cfc310f833c153b06 Mon Sep 17 00:00:00 2001 From: MiguelPelegrina <95084406+MiguelPelegrina@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:15:03 +0200 Subject: [PATCH 1/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 131bc2c..a7708f7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![Build Status](https://github.com/MiguelPelegrina/java_school_online_store_api/actions/workflows/ci.yaml/badge.svg) + # JavaSchoolFinalTask2 Final Task Online store information system. From a8f310299b69fb20ff8a7fc936788605927400b1 Mon Sep 17 00:00:00 2001 From: MiguelPelegrina <95084406+MiguelPelegrina@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:27:20 +0200 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7708f7..46d69b0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Build Status](https://github.com/MiguelPelegrina/java_school_online_store_api/actions/workflows/ci.yaml/badge.svg) +![Build Status](https://github.com/MiguelPelegrina/java_school_online_store_api/actions/workflows/ci.yml/badge.svg) # JavaSchoolFinalTask2 Final Task From a53fbe81b2608f7229f0478b70cb644febbc79b6 Mon Sep 17 00:00:00 2001 From: MiguelPelegrina <95084406+MiguelPelegrina@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:50:09 +0200 Subject: [PATCH 3/6] Update ci.yml --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0019582..7bda563 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,11 @@ name: CI Workflow on: push: - branches: [ "master" ] + branches: + - main pull_request: - branches: [ "master" ] + branches: + - main workflow_dispatch: jobs: From 346645a0496aef5f23d7baef4d1330d63288ca69 Mon Sep 17 00:00:00 2001 From: MiguelPelegrina <95084406+MiguelPelegrina@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:19:24 +0200 Subject: [PATCH 4/6] Update ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bda563..dc22014 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: pull_request: branches: - main - workflow_dispatch: jobs: build: From 4610364e8734a09439e747cdfac39d2edc434307 Mon Sep 17 00:00:00 2001 From: MiguelPelegrina <95084406+MiguelPelegrina@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:26:27 +0200 Subject: [PATCH 5/6] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc22014..ae80a20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - main pull_request: branches: - - main + - main jobs: build: From d13095dfccd2a1e0c0f1b37f112cbd232a0e2b9f Mon Sep 17 00:00:00 2001 From: MiguelPelegrina <95084406+MiguelPelegrina@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:27:35 +0200 Subject: [PATCH 6/6] Update ci.yml --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae80a20..0019582 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,11 +2,10 @@ name: CI Workflow on: push: - branches: - - main + branches: [ "master" ] pull_request: - branches: - - main + branches: [ "master" ] + workflow_dispatch: jobs: build: