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

simplified version stamping #1583

Merged
merged 8 commits into from
Nov 8, 2022
Merged

simplified version stamping #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37f591a
simplified version stamping
Nov 7, 2022
7af7ef4
testing CI verification step
Nov 7, 2022
8572f1d
oops, gott use the right one
Nov 7, 2022
20b30bb
let's see if the step will fail now
Nov 7, 2022
87185db
provide more info on failures
Nov 7, 2022
8322936
removed all testing changes
Nov 7, 2022
5e77cbf
accidentally enabled old e2e tests
Nov 7, 2022
9e0771c
restored to normal version workflow call
Nov 7, 2022
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
7 changes: 5 additions & 2 deletions .github/workflows/integrate-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@ jobs:
run: npm ci
-
name: Build legacy app
run: docker compose build --build-arg ENVIRONMENT=production --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG_APP }} app
-
name: Verify version stamping
run: |
docker compose build --build-arg ENVIRONMENT=production --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG_APP }} app
docker compose run --rm app cat /var/www/html/build-version.txt /var/www/html/version.php
docker compose run --rm app cat build-version.txt version.php
docker compose run --rm app cat version.php | grep ${{ steps.image.outputs.TAG_APP }}
-
name: Build "next" images
run: make build-next
Expand Down
4 changes: 2 additions & 2 deletions docker/app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ COPY --from=composer-builder /composer/vendor /var/www/html/vendor
COPY docker/app/symfony-exceptions.patch /
RUN patch -p4 -i /symfony-exceptions.patch

RUN echo "${BUILD_VERSION}" > /var/www/html/build-version.txt \
&& sed -i /var/www/html/version.php -e "s/^\\(define('VERSION', '\\).*;\$/\\1${BUILD_VERSION}'\\);/"
RUN echo "${BUILD_VERSION}" > build-version.txt \
&& sed -i "s/9.9.9/${BUILD_VERSION}/" version.php

ENTRYPOINT [ "tini", "-g", "--" ]
CMD [ "apache2-foreground" ]