Skip to content

Release #1577

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

Merged
evereq merged 4 commits into from
Oct 16, 2025
Merged

Release #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bc57f5
Update Dockerfile
evereq Oct 16, 2025
6334637
Merge pull request #1570 from duncan222/feature/AdminPage_Option_To_C…
duncan222 Oct 16, 2025
cc42796
Update docker-build-publish.yml (#1575)
evereq Oct 16, 2025
5d0dad7
Stage (#1576)
evereq Oct 16, 2025
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
6 changes: 3 additions & 3 deletions .deploy/api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ ENV CI=true

RUN apk --update add bash \
&& apk add libexecinfo libexecinfo-dev \
&& npm i -g npm \
&& npm i -g npm@8.19.4 \
&& apk add --no-cache --virtual build-dependencies build-base \
snappy dos2unix g++ snappy-dev gcc libgcc libstdc++ linux-headers autoconf automake make nasm python2 py2-setuptools vips-dev git \
&& npm install --quiet node-gyp -g \
&& npm install --quiet node-gyp@9.4.0 -g \
&& npm config set python /usr/bin/python \
&& npm install yarn -g --force \
&& npm install yarn@1.22.22 -g --force \
&& mkdir /srv/ever && chown -R node:node /srv/ever

COPY wait .deploy/api/entrypoint.compose.sh .deploy/api/entrypoint.prod.sh /
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/deploy-do.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
name: Deploy to DigitalOcean

on:
workflow_run:
workflows: ['Build and Publish Docker Images']
branches: [ develop, master ]
types:
- completed
push:
branches:
- develop
- stage
- master
Comment on lines +4 to +8
Copy link

@greptile-apps greptile-apps bot Oct 16, 2025

Choose a reason for hiding this comment

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

logic: Changing from workflow_run to push trigger means deployments will run before Docker images are built, potentially deploying stale :latest images

Prompt To Fix With AI 
This is a comment left during a code review.
Path: .github/workflows/deploy-do.yml
Line: 4:8

Comment:
**logic:** Changing from workflow_run to push trigger means deployments will run before Docker images are built, potentially deploying stale :latest images

How can I resolve this? If you propose a fix, please make it concise.


# on:
# workflow_run:
# workflows: ['Build and Publish Docker Images']
# branches: [ develop, stage, master ]
# types:
# - completed
Comment on lines +10 to +15
Copy link

@greptile-apps greptile-apps bot Oct 16, 2025

Choose a reason for hiding this comment

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

style: Consider using the workflow_run trigger instead to ensure proper build-then-deploy sequence

Prompt To Fix With AI 
This is a comment left during a code review.
Path: .github/workflows/deploy-do.yml
Line: 10:15

Comment:
**style:** Consider using the workflow_run trigger instead to ensure proper build-then-deploy sequence

How can I resolve this? If you propose a fix, please make it concise.


jobs:
deploy-dev:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-build-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- develop
- stage
- master

jobs:
Expand Down
8 changes: 6 additions & 2 deletions ...es/admin-web-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ export class ThemeSettingsComponent {
value: 'es-ES',
name: 'Spanish',
},
{
value: 'fr-FR',
name: 'French'
}
];

themes = [
Expand Down Expand Up @@ -73,15 +77,15 @@ export class ThemeSettingsComponent {
) {
this.defaultLanguage = environment['DEFAULT_LANGUAGE'];

translate.addLangs(['en-US', 'bg-BG', 'he-IL', 'ru-RU', 'es-ES']);
translate.addLangs(['en-US', 'bg-BG', 'he-IL', 'ru-RU', 'es-ES', 'fr-FR']);
translate.setDefaultLang('en-US');

const browserLang = translate.getBrowserLang();
if (this.defaultLanguage) {
translate.use(this.defaultLanguage);
} else {
translate.use(
browserLang.match(/en-US|bg-BG|he-IL|ru-RU|es-ES/)
browserLang.match(/en-US|bg-BG|he-IL|ru-RU|es-ES|fr-FR/)
? browserLang
: 'en-US'
);
Expand Down
Loading
Loading