diff --git a/.github/workflows/dockers_builder_dev.yml b/.github/workflows/dockers_builder_dev.yml index e5bdd5e994..a62d62a7db 100644 --- a/.github/workflows/dockers_builder_dev.yml +++ b/.github/workflows/dockers_builder_dev.yml @@ -1,6 +1,7 @@ name: Build Navitia Dockers (Dev) on: + pull_request: push: branches: - dev @@ -209,31 +210,25 @@ jobs: run: | pip install -r core_team_ci_tools/github_artifacts/requirements.txt --user - - name: Download mimirsbrunn package - run: | - mimirsbrunn_package="debian-package-master.zip" - python3 core_team_ci_tools/github_artifacts/github_artifacts.py \ - -o hove-io \ - -r mimirsbrunn \ - -t ${{ steps.ci-core-app-token.outputs.token }} \ - -w main7.yml \ - -a debian-package-master.zip \ - --output-dir . - unzip -qo $mimirsbrunn_package - rm -f $mimirsbrunn_package + # don't forget to update the version of mimirsbrunn if necessary!! + - name: Download mimirsbrunn v3.1.0 from release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'hove-io/mimirsbrunn' + version: 'tags/v3.1.0' + file: 'mimirsbrunn7_${{env.jessie_version}}-3.1.0.deb' + target: 'mimirsbrunn7_${{env.jessie_version}}-3.1.0.deb' + token: ${{ steps.ci-core-app-token.outputs.token }} - - name: Download cosmogony2cities package - run: | - cosmogony2cities_package="package-${{env.jessie_version}}.zip" - python3 core_team_ci_tools/github_artifacts/github_artifacts.py \ - -o hove-io \ - -r cosmogony2cities \ - -t ${{ steps.ci-core-app-token.outputs.token }} \ - -w build_package.yml \ - -a $cosmogony2cities_package \ - --output-dir . - unzip -qo $cosmogony2cities_package - rm -f $cosmogony2cities_package + # don't forget to update the version of cosmogony2cities if necessary!! + - name: Download cosmogony2cities from release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'hove-io/cosmogony2cities' + version: 'tags/v0.1.1' + file: 'cosmogony2cities-${{env.jessie_version}}.deb' + target: 'cosmogony2cities_0.1.0-1_amd64.deb' + token: ${{ steps.ci-core-app-token.outputs.token }} - name: Download mimir-config package run: | diff --git a/.github/workflows/dockers_builder_release.yml b/.github/workflows/dockers_builder_release.yml index d6ccb21710..0fa4d0856c 100644 --- a/.github/workflows/dockers_builder_release.yml +++ b/.github/workflows/dockers_builder_release.yml @@ -234,18 +234,14 @@ jobs: unzip -qo $mimirsbrunn_package rm -f $mimirsbrunn_package - - name: Download cosmogony2cities package - run: | - cosmogony2cities_package="package-${{env.jessie_version}}.zip" - python3 core_team_ci_tools/github_artifacts/github_artifacts.py \ - -o hove-io \ - -r cosmogony2cities \ - -t ${{ steps.ci-core-app-token.outputs.token }} \ - -w build_package.yml \ - -a $cosmogony2cities_package \ - --output-dir . - unzip -qo $cosmogony2cities_package - rm -f $cosmogony2cities_package + - name: Download cosmogony2cities from release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'hove-io/cosmogony2cities' + version: 'tags/v0.1.1' + file: 'cosmogony2cities-${{env.jessie_version}}.deb' + target: 'cosmogony2cities_0.1.0-1_amd64.deb' + token: ${{ steps.ci-core-app-token.outputs.token }} - name: Download mimir-config package run: |