From bda93824ce1c836a257c62750faad373b738559a Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 10 Aug 2021 08:53:39 +0100 Subject: [PATCH 1/4] Update haskell.yml --- .github/workflows/haskell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ba1e3d8..4680ab8 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -2,9 +2,9 @@ name: Haskell CI on: push: - branches: [ publicDev ] + branches: [ main, staging, publicDev ] pull_request: - branches: [ publicDev ] + branches: [ main, staging, publicDev ] jobs: build: From 3fc192748832f28fd3a1ad44a774b0247d4efd5d Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 10 Aug 2021 08:55:25 +0100 Subject: [PATCH 2/4] Create docker-image.yml --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..3af9833 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag FMCt-web:$(date +%s) From 9cfdbf44571c6b24aad779e2107378d9a65ee81d Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 10 Aug 2021 08:56:09 +0100 Subject: [PATCH 3/4] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 3af9833..97c4312 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,4 +15,4 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build the Docker image - run: docker build . --file Dockerfile --tag FMCt-web:$(date +%s) + run: docker build . --file Dockerfile --tag FMCtweb:$(date +%s) From 8bc495e028d060d196718ca689fb7e70e9040ce8 Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 10 Aug 2021 08:58:08 +0100 Subject: [PATCH 4/4] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 97c4312..bb14cff 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -15,4 +15,4 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build the Docker image - run: docker build . --file Dockerfile --tag FMCtweb:$(date +%s) + run: docker build . --file Dockerfile --tag fmctweb:$(date +%s)