mirror of
https://github.com/EDCD/coriolis.git
synced 2025-12-09 14:45:35 +00:00
Compare commits
20 Commits
feature/ed
...
jenkins
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e060173e84 | ||
|
|
4d859da731 | ||
|
|
f2deb8675f | ||
|
|
67a4952dfd | ||
|
|
26e8cfd805 | ||
|
|
82718331ce | ||
|
|
de38f2829c | ||
|
|
b0a608b5cd | ||
|
|
307886d4ae | ||
|
|
bbba048129 | ||
|
|
222173b388 | ||
|
|
3987c4e681 | ||
|
|
e129e1da39 | ||
|
|
8acd32b0fc | ||
|
|
f8f99a5aaa | ||
|
|
70cfa58896 | ||
|
|
56571f9c1f | ||
|
|
4ab376d9ed | ||
|
|
2858ef3e93 | ||
|
|
3215b3942d |
23
Jenkinsfile
vendored
Normal file
23
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
pipeline {
|
||||
agent any
|
||||
stages {
|
||||
stage('Get coriolis-data') {
|
||||
steps {
|
||||
sh '''YES=`echo $GIT_BRANCH | awk -F / \'{print $2}\'`
|
||||
export BRANCH=`git rev-parse --abbrev-ref $YES`
|
||||
rm -rf $WORKSPACE/../coriolis-data
|
||||
git clone https://github.com/edcd/coriolis-data.git $WORKSPACE/../coriolis-data
|
||||
cd ../coriolis-data
|
||||
git fetch --all
|
||||
git checkout $BRANCH'''
|
||||
}
|
||||
}
|
||||
stage('Build') {
|
||||
steps {
|
||||
sshagent (credentials: ['63c9de04-3213-47c3-8345-2f3442097a5b']) {
|
||||
sh 'ssh -p 56499 -o StrictHostKeyChecking=no willb@172.17.0.1 echo hi'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -23,8 +23,10 @@ export default class ModalOrbis extends TranslatedComponent {
|
||||
this.state = {
|
||||
orbisCreds: Persist.getOrbisCreds(),
|
||||
orbisUrl: '...',
|
||||
ship: this.props.ship,
|
||||
authenticatedStatus: 'Checking...'
|
||||
};
|
||||
this.orbisCategory = this.orbisCategory.bind(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -88,6 +90,17 @@ export default class ModalOrbis extends TranslatedComponent {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Handler for changing category
|
||||
* @param {SyntheticEvent} e React Event
|
||||
*/
|
||||
orbisCategory(e) {
|
||||
let ship = this.state.ship;
|
||||
let cat = e.target.value;
|
||||
ship.category = cat;
|
||||
this.setState({ship});
|
||||
}
|
||||
|
||||
/**
|
||||
* Render the modal
|
||||
* @return {React.Component} Modal Content
|
||||
@@ -106,6 +119,17 @@ export default class ModalOrbis extends TranslatedComponent {
|
||||
<br/><br/>
|
||||
<a className='button' href="https://orbis.zone/api/auth">Log in / signup to Orbis</a>
|
||||
<br/><br/>
|
||||
<h3>Category</h3>
|
||||
<select onChange={this.orbisCategory}>
|
||||
<option value="">No Category</option>
|
||||
<option>Combat</option>
|
||||
<option>Mining</option>
|
||||
<option>Trading</option>
|
||||
<option>Exploration</option>
|
||||
<option>Passenger Liner</option>
|
||||
<option>PvP</option>
|
||||
</select>
|
||||
<br/><br/>
|
||||
<h3 >{translate('Orbis link')}</h3>
|
||||
<input value={this.state.orbisUrl} readOnly size={25} onFocus={ (e) => e.target.select() }/>
|
||||
<br/><br/>
|
||||
|
||||
@@ -59,9 +59,7 @@
|
||||
<!-- End Piwik Code -->
|
||||
|
||||
<!-- Bugsnag -->
|
||||
<script src="//d2wy8f7a9ursnm.cloudfront.net/v4/bugsnag.min.js"></script>
|
||||
<script
|
||||
src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-plugins/v1/bugsnag-react.min.js"></script>
|
||||
<script src="https://d2wy8f7a9ursnm.cloudfront.net/v5.0.0/bugsnag.min.js"></script>
|
||||
<script>
|
||||
window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.BUGSNAG_VERSION || undefined})
|
||||
window.Bugsnag = window.bugsnagClient
|
||||
|
||||
Reference in New Issue
Block a user