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

Jump to bottom

Copy up-to-date scripts instead of using cached ones #632

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Copy up-to-date scripts instead of using cached ones #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad03fc3
Fix whitespace
SuperSandro2000 Jul 9, 2024
4a182d7
Copy up-to-date scripts instead of using cached ones
SuperSandro2000 Jul 9, 2024
db2d031
Allow overwriting FLY variable
SuperSandro2000 Jul 9, 2024
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
4 changes: 2 additions & 2 deletions ci/Dockerfile.assets.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN mkdir -p /tmp/final/global && cp /juno/README.md /tmp/final/global/

WORKDIR /tmp/final

# ADD generate_importmap.mjs /juno/ci/scripts/generate_importmap.mjs
ADD generate_importmap.mjs /juno/ci/scripts/generate_importmap.mjs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this wouldn't work cause the build context isn't the juno repo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copy the script over here 4a182d7 (#632) and I tested it in the pipeline already.

# delete old importmaps and manifests and obsolete assets (see: ci/obsolete_assets.json
RUN \
rm -rf externals_* importmap* importmap* ; \
Expand Down Expand Up @@ -130,7 +130,7 @@ RUN apk add --no-cache findutils zopfli \
# /tmp/final/manifest.json

# Check the integrity of the file structure
# ADD check_file_integrity.sh /juno/ci/scripts/check_file_integrity.sh
ADD check_file_integrity.sh /juno/ci/scripts/check_file_integrity.sh
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

RUN chmod +x /juno/ci/scripts/check_file_integrity.sh && \
/juno/ci/scripts/check_file_integrity.sh global apps libs packages assets externals index.html mount-test.html manifest.json importmap.json

Expand Down
8 changes: 4 additions & 4 deletions ci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# NOTE:
# NOTE:
# Hijack Build Container for debug
# fly -t v5 intercept -u URL_FROM_BUILD

FLY := fly -t v5
FLY ?= fly -t v5
ci: ci-clean ci-create
$(FLY) set-pipeline --pipeline juno-v3 -c pipeline.yaml -l ./vars.yaml

login:
$(FLY) login -c https://ci1.eu-de-2.cloud.sap -n services

ci-clean:
ci-clean:
if [ -e pipeline.yaml ]; then rm pipeline.yaml; fi

ci-create:
Expand All @@ -19,7 +19,7 @@ ci-create:
# Usage: make generate-hosting NAME=dashboard PROPS='{"region": "eu-de-1"}'
# NAME is the name of the asset to be hosted
# PROPS is a json which will be passed to the asset script tag via data-props-*
PROPS ?=
PROPS ?=
generate-hosting: ensure-name
echo generate helm charts for hosting $(NAME) with PROPS $(PROPS)
@echo "\033[92m * generate helm charts for hosting $(NAME) with PROPS $(PROPS)\033[0m"
Expand Down
Loading
Loading