Skip to content

Commit 4062108

Browse files
committed
appUrl, deployment - app url to array, deployment back to beta
/preview/ only affects frontend routing, assets stay at /beta/
1 parent 7e9d34e commit 4062108

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/cypress.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
run: |
211211
echo waiting for containers to start
212212
sleep 30
213-
curl http://localhost:8002/preview/ansible/automation-hub/ | tee /dev/stderr | grep '/preview/apps/chrome/js/'
213+
curl http://localhost:8002/preview/ansible/automation-hub/ | tee /dev/stderr | grep '/beta/apps/chrome/js/'
214214
sleep 30
215215
216216
- name: "Ensure galaxykit can connect to API (standalone)"

config/webpack.base.config.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,13 @@ module.exports = (inputConfigs) => {
122122
// insights dev
123123
...(!isStandalone &&
124124
!isBuild && {
125-
appUrl: customConfigs.UI_BASE_PATH,
126-
deployment: cloudBeta !== 'false' ? 'preview/apps' : 'apps',
125+
appUrl: customConfigs.UI_BASE_PATH.includes('/preview/')
126+
? [
127+
customConfigs.UI_BASE_PATH,
128+
customConfigs.UI_BASE_PATH.replace('/preview/', '/beta/'),
129+
]
130+
: customConfigs.UI_BASE_PATH,
131+
deployment: cloudBeta !== 'false' ? 'beta/apps' : 'apps',
127132
standalone: {
128133
api: {
129134
context: [customConfigs.API_BASE_PATH],
@@ -138,7 +143,7 @@ module.exports = (inputConfigs) => {
138143
// insights deployments from master
139144
...(!isStandalone &&
140145
cloudBeta && {
141-
deployment: cloudBeta === 'true' ? 'preview/apps' : 'apps',
146+
deployment: cloudBeta === 'true' ? 'beta/apps' : 'apps',
142147
}),
143148
});
144149

0 commit comments

Comments
 (0)