diff --git a/.docker/docker_start_script.sh b/.docker/docker_start_script.sh index f4bc17032..daf82b32e 100644 --- a/.docker/docker_start_script.sh +++ b/.docker/docker_start_script.sh @@ -33,6 +33,7 @@ fi #TODO: start cron jobs # change python environment +echo "Starting up e-mission-environment..." source setup/activate.sh # launch the webapp diff --git a/.github/workflows/image_build_push.yml b/.github/workflows/image_build_push.yml index b098c7cde..aff75e152 100644 --- a/.github/workflows/image_build_push.yml +++ b/.github/workflows/image_build_push.yml @@ -7,7 +7,7 @@ name: docker image on: push: # TODO: Change branch to master branch of e-mission-server - branches: [ tags-combo-approach ] + branches: [ consolidate-differences ] # Env variable env: diff --git a/.github/workflows/osx-ubuntu-manual-install.yml b/.github/workflows/osx-ubuntu-manual-install.yml index e6ecf0ddc..00db6f1f9 100644 --- a/.github/workflows/osx-ubuntu-manual-install.yml +++ b/.github/workflows/osx-ubuntu-manual-install.yml @@ -5,11 +5,12 @@ name: osx-ubuntu-manual-install on: push: branches: - - master - - gis-based-mode-detection + # - master + # - gis-based-mode-detection + - consolidate-differences pull_request: branches: - - master + # - master - gis-based-mode-detection schedule: # * is a special character in YAML so you have to quote this string diff --git a/.github/workflows/test-default-action.yml b/.github/workflows/test-default-action.yml index 424e5bee1..15b38e593 100644 --- a/.github/workflows/test-default-action.yml +++ b/.github/workflows/test-default-action.yml @@ -7,11 +7,12 @@ name: CI on: push: branches: - - master - - gis-based-mode-detection + # - master + # - gis-based-mode-detection + - consolidate-differences pull_request: branches: - - master + # - master - gis-based-mode-detection # A workflow run is made up of one or more jobs that can run sequentially or in parallel diff --git a/.github/workflows/test-with-docker.yml b/.github/workflows/test-with-docker.yml index e38499544..a71fda621 100644 --- a/.github/workflows/test-with-docker.yml +++ b/.github/workflows/test-with-docker.yml @@ -6,9 +6,9 @@ name: test-with-docker # events but only for the master branch on: push: - branches: [ master ] + branches: [ consolidate-differences ] pull_request: - branches: [ master ] + branches: [ consolidate-differences ] schedule: # * is a special character in YAML so you have to quote this string - cron: '5 4 * * 0' diff --git a/.github/workflows/test-with-manual-install.yml b/.github/workflows/test-with-manual-install.yml index 4a81eb000..0056cc37a 100644 --- a/.github/workflows/test-with-manual-install.yml +++ b/.github/workflows/test-with-manual-install.yml @@ -7,12 +7,14 @@ name: ubuntu-only-test-with-manual-install on: push: branches: - - master - - gis-based-mode-detection + # - master + # - gis-based-mode-detection + - consolidate-differences pull_request: branches: - - master - - gis-based-mode-detection + # - master + # - gis-based-mode-detection + - consolidate-differences schedule: # * is a special character in YAML so you have to quote this string - cron: '5 4 * * 0'