Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MERGE ME NEXT: Remove styles #597

Merged
merged 1 commit into from
Oct 25, 2022
Merged

MERGE ME NEXT: Remove styles #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@ workflows:
requires:
- martin-build
- meta-pack
- styles-pack
- deploy:
context:
- entitlementcard-apt
requires:
- backend-pack
- administration-pack
- styles-pack
- martin-pack
- meta-pack
filters:
Expand Down Expand Up @@ -374,31 +372,6 @@ jobs:
paths:
- debs/*.deb

styles-pack:
docker:
- image: debian:11 # We deploy on debian -> pack on debian
working_directory: ~/project/map-tiles/styles
steps:
- checkout:
path: ~/project
- run:
name: "Setup dependencies"
command: |
apt-get update
apt-get install -y curl
- run:
name: "Download legacy styles deb"
command: curl -o eak-map-styles_0.4785-1_all.deb https://github.com/digitalfabrik/ehrenamtskarte-maplibre-style/releases/download/before-migration/eak-map-styles_0.4785-1_all.deb
- run:
name: "Move .deb to artifacts folder"
command: |
mkdir -p /tmp/artifacts/debs
mv *.deb /tmp/artifacts/debs
- persist_to_workspace:
root: /tmp/artifacts
paths:
- debs/*.deb

martin-pack:
docker:
- image: debian:11 # We deploy on debian -> pack on debian
Expand Down Expand Up @@ -433,7 +406,7 @@ jobs:
steps:
- checkout:
path: ~/project
- run: ~/project/scripts/pack_deb.sh -v "0.$CIRCLE_BUILD_NUM" -d "Meta package for the Ehrenamtskarte app" -n "eak" -c "eak-backend, eak-administration, eak-map-styles, eak-martin"
- run: ~/project/scripts/pack_deb.sh -v "0.$CIRCLE_BUILD_NUM" -d "Meta package for the Ehrenamtskarte app" -n "eak" -c "eak-backend, eak-administration, eak-martin"
- run: |
mkdir -p /tmp/artifacts/debs
cp *.deb /tmp/artifacts/debs
Expand Down
8 changes: 1 addition & 7 deletions scripts/pack_deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ do
f) adminfolder=${OPTARG};;
s) servicefile=${OPTARG};;
c) dependencies=${OPTARG};;
m) stylesfolder=${OPTARG};;
M) martinfolder=${OPTARG};;
C) configfile=${OPTARG};;
h)
echo "$0 [-v version] [-r revision] [-a architecture] [-n name] [-t backend_tar] [-s service_file] [-d description] [-f adminfolder] [-c dependencies] [-m mapboxstylesfolder] [-M martinfolder] [-C configfile]"
echo "$0 [-v version] [-r revision] [-a architecture] [-n name] [-t backend_tar] [-s service_file] [-d description] [-f adminfolder] [-c dependencies] [-M martinfolder] [-C configfile]"
exit 0;;
*)
echo "Unknown flag"
Expand Down Expand Up @@ -74,11 +73,6 @@ if [[ -n "$adminfolder" ]]; then
mkdir -p "${debworkdir}/opt/ehrenamtskarte/administration"
cp -r "$adminfolder/"* "${debworkdir}/opt/ehrenamtskarte/administration"
fi
if [[ -n "$stylesfolder" ]]; then
echo "Copying $stylesfolder …"
mkdir -p "${debworkdir}/opt/ehrenamtskarte/styles"
cp -r "$stylesfolder/"* "${debworkdir}/opt/ehrenamtskarte/styles"
fi
if [[ -n "$martinfolder" ]]; then
echo "Copying $martinfolder …"
mkdir -p "${debworkdir}/opt/ehrenamtskarte/martin"
Expand Down