mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-20 05:13:58 +00:00
Use protobuf, new branch
Signed-off-by: zyphlar <zyphlar@noreply.codeberg.org>
This commit is contained in:
@@ -68,7 +68,9 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
apt-get update -y
|
apt-get update -y
|
||||||
apt-get install -y pyosmium osmium-tool python3-venv wget2
|
apt-get install -y pyosmium osmium-tool python3-venv python3-pip wget2
|
||||||
|
rm -f /usr/lib/python*/EXTERNALLY-MANAGED
|
||||||
|
pip3 install "protobuf<4"
|
||||||
- name: Download Planet File if Absent
|
- name: Download Planet File if Absent
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
@@ -186,13 +188,15 @@ jobs:
|
|||||||
libxcursor-dev \
|
libxcursor-dev \
|
||||||
libxi-dev \
|
libxi-dev \
|
||||||
zlib1g-dev
|
zlib1g-dev
|
||||||
|
rm -f /usr/lib/python*/EXTERNALLY-MANAGED
|
||||||
|
pip3 install "protobuf<4"
|
||||||
- name: Clone main repo if necessary
|
- name: Clone main repo if necessary
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
||||||
apt-get update -qq && apt-get install -y --no-install-recommends git
|
apt-get update -qq && apt-get install -y --no-install-recommends git
|
||||||
cd /media/4tbexternal
|
cd /media/4tbexternal
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
||||||
fi
|
fi
|
||||||
- name: Update Isolines
|
- name: Update Isolines
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -225,7 +229,9 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
apt-get update -qq && apt-get install -y --no-install-recommends curl osmctools osmium-tool python3-venv ca-certificates git
|
apt-get update -qq && apt-get install -y --no-install-recommends curl osmctools osmium-tool python3-venv ca-certificates git python3-pip
|
||||||
|
rm -f /usr/lib/python*/EXTERNALLY-MANAGED
|
||||||
|
pip3 install "protobuf<4"
|
||||||
- name: Clone subways if necessary
|
- name: Clone subways if necessary
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
@@ -238,7 +244,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
||||||
cd /media/4tbexternal
|
cd /media/4tbexternal
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
||||||
fi
|
fi
|
||||||
- name: Update Subways
|
- name: Update Subways
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -275,7 +281,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
||||||
cd /media/4tbexternal
|
cd /media/4tbexternal
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
||||||
fi
|
fi
|
||||||
- name: Build address_parser
|
- name: Build address_parser
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -347,7 +353,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
if [ ! -d /media/4tbexternal/comaps-init ]; then
|
||||||
cd /media/4tbexternal
|
cd /media/4tbexternal
|
||||||
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
git clone --recurse-submodules --shallow-submodules -b rebase-generator-pastk-wb251014 --single-branch https://codeberg.org/comaps/comaps.git comaps-init
|
||||||
fi
|
fi
|
||||||
- name: Make output folders if necessary
|
- name: Make output folders if necessary
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
Reference in New Issue
Block a user