Merge branch 'main' of github.com:cstml/FMCt into main

cstml · Aug 10, 2021 · 5c524f6 · 5c524f6
2 parents e2cd753 + 8bc495e
commit 5c524f6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/docker-image.yml 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 fmctweb:$(date +%s)
diff --git 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: