Skip to content

[pull] develop from baserow:develop #97

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
pull merged 9 commits into from
Dec 3, 2025
Merged

[pull] develop from baserow:develop #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37be175
Fix migration conflict (#4382)
bram2w Dec 3, 2025
9a2d523
Update email compiler dependencies (#4381)
bram2w Dec 3, 2025
06600a8
Refactor the element theme override components. (#4376)
picklepete Dec 3, 2025
cfb684a
[2/6] View level permissions - Filters (#4070)
bram2w Dec 3, 2025
88c68d6
Publish latest tag on release tag pipeline (#4372)
bram2w Dec 3, 2025
e9183bc
Improve performance in the `database_pendingsearchvalueupdate` table …
bram2w Dec 3, 2025
c8111d0
Improve workspace usage update performance (#4374)
bram2w Dec 3, 2025
3f79a2d
Prevent always setting LLM model in Helm Chart (#4332)
bram2w Dec 3, 2025
1a5fe5e
[3/6] View level permissions - Rows (#4072)
bram2w Dec 3, 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
12 changes: 9 additions & 3 deletions .github/workflows/publish-release-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,16 @@ jobs:
AMD64=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/backend:${{ env.CI_TESTED_TAG_SUFFIX }}
ARM64=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/backend:${{ env.CI_TESTED_TAG_SUFFIX }}-arm64
TARGET=${{ env.RELEASE_DOCKER_REPOSITORY }}/backend:${{ github.ref_name }}
LATEST=${{ env.RELEASE_DOCKER_REPOSITORY }}/backend:latest

echo "Creating multi-arch image:"
echo " $TARGET"
echo " $LATEST"
echo "from:"
echo " $AMD64"
echo " $ARM64"

docker buildx imagetools create -t "$TARGET" "$AMD64" "$ARM64"
docker buildx imagetools create -t "$TARGET" -t "$LATEST" "$AMD64" "$ARM64"

build-webfrontend-arm64-release-image:
name: Build web-frontend arm64 image (GHCR)
Expand Down Expand Up @@ -152,14 +154,16 @@ jobs:
AMD64=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/web-frontend:${{ env.CI_TESTED_TAG_SUFFIX }}
ARM64=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/web-frontend:${{ env.CI_TESTED_TAG_SUFFIX }}-arm64
TARGET=${{ env.RELEASE_DOCKER_REPOSITORY }}/web-frontend:${{ github.ref_name }}
LATEST=${{ env.RELEASE_DOCKER_REPOSITORY }}/web-frontend:latest

echo "Creating multi-arch image:"
echo " $TARGET"
echo " $LATEST"
echo "from:"
echo " $AMD64"
echo " $ARM64"

docker buildx imagetools create --debug -t "$TARGET" "$AMD64" "$ARM64"
docker buildx imagetools create --debug -t "$TARGET" -t "$LATEST" "$AMD64" "$ARM64"

build-all-in-one-arm64-release-image:
name: Build baserow (all-in-one) arm64 image (GHCR)
Expand Down Expand Up @@ -231,14 +235,16 @@ jobs:
AMD64=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/baserow:${{ env.CI_TESTED_TAG_SUFFIX }}
ARM64=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/baserow:${{ env.CI_TESTED_TAG_SUFFIX }}-arm64
TARGET=${{ env.RELEASE_DOCKER_REPOSITORY }}/baserow:${{ github.ref_name }}
LATEST=${{ env.RELEASE_DOCKER_REPOSITORY }}/baserow:latest

echo "Creating multi-arch image:"
echo " $TARGET"
echo " $LATEST"
echo "from:"
echo " $AMD64"
echo " $ARM64"

docker buildx imagetools create -t "$TARGET" "$AMD64" "$ARM64"
docker buildx imagetools create -t "$TARGET" -t "$LATEST" "$AMD64" "$ARM64"

build-cloudron-arm64-release-image:
name: Build cloudron arm64 image (GHCR)
Expand Down
9 changes: 4 additions & 5 deletions backend/email_compiler/baserowEmailCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const mjml2html = require('mjml')
const fs = require('fs')
const Eta = require('eta')
const path = require('path')
const glob = require('glob')
const { globSync } = require('glob')
const chokidar = require('chokidar')

const BASEROW_BACKEND_SRC_DIR = path.join(__dirname, '..', 'src')
Expand Down Expand Up @@ -52,10 +52,9 @@ function compileEtaAndMjml(mjmlEtaFile) {

function recompileAllEtaAndMjmlFilesAfterLayoutFileChanges(layoutFile) {
console.log(`Layout file changed (${layoutFile})`)
glob(MJML_ETA_FILE_GLOB, {}, function (er, files) {
files.forEach((file) => {
compileEtaAndMjml(file)
})
const files = globSync(MJML_ETA_FILE_GLOB)
files.forEach((file) => {
compileEtaAndMjml(file)
})
}

Expand Down
6 changes: 3 additions & 3 deletions backend/email_compiler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"dependencies": {
"chalk": "^5.0.0",
"chokidar": "^3.5.3",
"eta": "^1.12.3",
"glob": "^7.2.0",
"mjml": "^4.12.0"
"eta": "^2.0.0",
"glob": "^9.0.0",
"mjml": "^4.15.0"
},
"author": "Bram Wiepjes (Baserow)",
"license": "MIT",
Expand Down
Loading
Loading