Commit 89954e5c authored by chickahoona's avatar chickahoona

changing artifact build

parent ccb9fba9
......@@ -44,19 +44,19 @@ firefox-extension:
stage: build
script:
- sh ./var/build-ubuntu.sh
- sh ./var/build-firefox-extension.sh
artifacts:
name: "firefox_$CI_BUILD_REF_NAME"
paths:
- build/firefox/
- dist/chrome/psono.firefox.PW.zip
chrome-extension:
stage: build
script:
- sh ./var/build-ubuntu.sh
- sh ./var/build-chrome-extension.sh
artifacts:
name: "chrome_$CI_BUILD_REF_NAME"
paths:
- build/chrome/
- dist/chrome/psono.chrome.PW.zip
job-release-docker:
stage: release
......@@ -90,6 +90,7 @@ job-deploy-chrome:
image: ubuntu:16.04
script:
- sh ./var/build-ubuntu.sh
- sh ./var/build-chrome-extension.sh
- sh ./var/deploy-chrome-extension.sh
environment:
name: chrome-webstore
......@@ -103,6 +104,7 @@ job-deploy-firefox:
image: ubuntu:16.04
script:
- sh ./var/build-ubuntu.sh
- sh ./var/build-firefox-extension.sh
- sh ./var/deploy-firefox-extension.sh
environment:
name: firefox-webstore
......
......@@ -183,7 +183,7 @@ gulp.task('chrome-deploy', function() {
extension1: {
publish: true,
appID: app_id,
zip: 'dist/chrome/psono.PW.zip'
zip: 'dist/chrome/psono.chrome.PW.zip'
}
},
uploadExtensions : ['extension1']
......@@ -221,7 +221,7 @@ gulp.task('firefox-deploy', function() {
algorithm: 'HS256' // HMAC-SHA256 signing algorithm
});
return run('curl "https://addons.mozilla.org/api/v3/addons/' + addon_id + '/versions/' + version + '/" -g -XPUT --form "upload=@dist/firefox/psono.PW.zip" -H "Authorization: JWT '+ token +'"').exec() // prints "Hello World\n".
return run('curl "https://addons.mozilla.org/api/v3/addons/' + addon_id + '/versions/' + version + '/" -g -XPUT --form "upload=@dist/firefox/psono.firefox.PW.zip" -H "Authorization: JWT '+ token +'"').exec() // prints "Hello World\n".
.pipe(gulp.dest('output'));
});
......
......@@ -56,7 +56,7 @@
],
"applications": {
"gecko": {
"id": "psono@psono.pw"
"id": "{3dce78ca-2a07-4017-9111-998d4f826625}"
}
}
}
#!/usr/bin/env bash
mkdir -p /builds/psono/psono-client/dist/chrome
cd /builds/psono/psono-client/build/chrome/
zip -r /builds/psono/psono-client/dist/chrome/psono.chrome.PW.zip *
\ No newline at end of file
#!/usr/bin/env bash
mkdir -p /builds/psono/psono-client/dist/firefox
cd /builds/psono/psono-client/build/firefox/
zip -r /builds/psono/psono-client/dist/firefox/psono.firefox.PW.zip *
\ No newline at end of file
#!/usr/bin/env bash
mkdir -p /builds/psono/psono-client/dist/chrome
cd /builds/psono/psono-client/build/chrome/
zip -r /builds/psono/psono-client/dist/chrome/psono.PW.zip *
cd /builds/psono/psono-client/
gulp --webstore_client_id=$webstore_client_id --webstore_client_secret=$webstore_client_secret \
--webstore_refresh_token=$webstore_refresh_token --webstore_app_id=$webstore_app_id chrome-deploy
#!/usr/bin/env bash
mkdir -p /builds/psono/psono-client/dist/firefox
cd /builds/psono/psono-client/build/firefox/
zip -r /builds/psono/psono-client/dist/firefox/psono.PW.zip *
cd /builds/psono/psono-client/
gulp --mozilla_jwt_issuer=$mozilla_jwt_issuer --mozilla_jwt_secret=$mozilla_jwt_secret \
--mozilla_addon_id=$mozilla_addon_id --mozilla_version=${CI_COMMIT_TAG:1:100} firefox-deploy
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment