Skip to content

Commit

Permalink
BUGFIX fix neos ui version label
Browse files Browse the repository at this point in the history
Resolves: #3781
  • Loading branch information
mhsdesign committed Jul 4, 2024
1 parent fd5c917 commit 78c9719
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Build/Jenkins/release-neos-ui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ make install
# acutal release process

# build
make build-production
make build-subpackages

# code quality
make lint
Expand Down
2 changes: 1 addition & 1 deletion Build/Jenkins/update-neos-ui-compiled.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export NODE_OPTIONS="--max-old-space-size=4096"

nvm install && nvm use
make clean && make setup
make build-production
NEOS_UI_VERSION="${GIT_TAG:-${GIT_BRANCH}-dev}" make build-production

rm -Rf tmp_compiled_pkg
git clone [email protected]:neos/neos-ui-compiled.git tmp_compiled_pkg
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ called-with-version:
ifeq ($(VERSION),)
@echo No version information given.
@echo Please run this command like this:
@echo VERSION=1.0.0 make bump-version
@echo VERSION=9.0.0 make ...
@false
endif

Expand Down
5 changes: 3 additions & 2 deletions esbuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ const {sep} = require('path')
const {compileWithCssVariables} = require('./cssVariables');
const {cssModules} = require('./cssModules');
const esbuild = require('esbuild');
const { version } = require('./package.json')

const isProduction = process.argv.includes('--production');
const isE2ETesting = process.argv.includes('--e2e-testing');
const isWatch = process.argv.includes('--watch');
const isAnalyze = process.argv.includes('--analyze');

const NEOS_UI_VERSION = process.env.NEOS_UI_VERSION ?? (isProduction ? 'production-build' : 'dev')

if (isE2ETesting) {
console.log('Building for E2E testing');
}
Expand Down Expand Up @@ -93,7 +94,7 @@ const options = {
],
define: {
// we dont declare `global = window` as we want to control everything and notice it, when something is odd
NEOS_UI_VERSION: JSON.stringify(isProduction ? `v${version}` : `v${version}-dev`)
NEOS_UI_VERSION: JSON.stringify(NEOS_UI_VERSION)
}
}

Expand Down

0 comments on commit 78c9719

Please sign in to comment.