File tree Expand file tree Collapse file tree 2 files changed +21
-17
lines changed
server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/ui Expand file tree Collapse file tree 2 files changed +21
-17
lines changed Original file line number Diff line number Diff line change @@ -151,24 +151,28 @@ pipeline {
151151 }
152152 }
153153
154- stage(' Deploy (master only)' ) {
155- when {
156- allOf {
157- branch ' master' ;
158- expression {
159- /* Only trigger the deployment job if the changeset contains changes in
160- the `server` or `client/packages/` directory */
161- sh(returnStatus : true , script : ' git diff --name-only HEAD^ | grep -q "^server"' ) == 0
162- }
154+ stage(' Archive Client Bundle' ) {
155+ steps {
156+ container(' ci' ) {
157+ archiveArtifacts artifacts : ' client/examples/workflow-webapp/dist/**' , fingerprint : true
163158 }
164159 }
165- stages {
166- stage(' Deploy server (P2)' ) {
167- steps {
168- build job : ' deploy-ide-p2-nightly' , wait : false
169- }
170-
171- }
160+ }
161+
162+ stage(' Deploy (master only)' ) {
163+ // TODO: Re-enable when condition after testing
164+ // when {
165+ // allOf {
166+ // branch 'master';
167+ // expression {
168+ // /* Only trigger the deployment job if the changeset contains changes in
169+ // the `server` or `client/packages/` directory */
170+ // sh(returnStatus: true, script: 'git diff --name-only HEAD^ | grep -q "^server"') == 0
171+ // }
172+ // }
173+ // }
174+ steps {
175+ build job : ' deploy-ide-p2-nightly' , wait : false
172176 }
173177 }
174178 }
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ public void focusGained(final FocusEvent e) {
4747
4848 @ Override
4949 public boolean isFocusControl () {
50- if (!focusTracker .get ()) {
50+ if (focusTracker != null && !focusTracker .get ()) {
5151 return false ;
5252 }
5353 return super .isFocusControl ();
You can’t perform that action at this time.
0 commit comments