Fixed setup errors and removed openssl installs
Fixed errors during setup Removed SSL install from CI pipeline for x86 builds
This commit is contained in:
parent
b682d44bf4
commit
2a1d0737a0
|
@ -12,8 +12,6 @@ test:
|
|||
script:
|
||||
- mkdir dist
|
||||
- touch dist/index.html
|
||||
- apt-get update
|
||||
- apt-get -y install pkg-config
|
||||
- cargo test
|
||||
|
||||
build-ui:
|
||||
|
@ -40,8 +38,6 @@ build-x64-bin:
|
|||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
script:
|
||||
- apt-get update
|
||||
- apt-get -y install libssl-dev pkg-config
|
||||
- cargo build --release
|
||||
- cd target/release
|
||||
- tar -czf ../../vade-linux-x64.tar.gz vade
|
||||
|
|
|
@ -62,7 +62,7 @@ impl actix_web::error::ResponseError for Error {
|
|||
fn status_code(&self) -> actix_web::http::StatusCode {
|
||||
match self.code {
|
||||
ErrorCode::UnAuthorized => StatusCode::UNAUTHORIZED,
|
||||
ErrorCode::NoSetup => StatusCode::OK,
|
||||
ErrorCode::NoSetup => StatusCode::UPGRADE_REQUIRED,
|
||||
_ => StatusCode::INTERNAL_SERVER_ERROR,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -191,14 +191,14 @@ export default {
|
|||
}
|
||||
},
|
||||
async reload() {
|
||||
this.applications = (await axios.get("/api/applications")).data.items;
|
||||
this.applications = (await axios.get("/api/applications")).data.items || [];
|
||||
this.applicationCategories = (
|
||||
await axios.get("/api/application_categories")
|
||||
).data.items;
|
||||
this.bookmarks = (await axios.get("/api/bookmarks")).data.items;
|
||||
).data.items || [];
|
||||
this.bookmarks = (await axios.get("/api/bookmarks")).data.items || [];
|
||||
this.bookmarkCategories = (
|
||||
await axios.get("/api/bookmark_categories")
|
||||
).data.items;
|
||||
).data.items || [];
|
||||
|
||||
this.editApp = {};
|
||||
this.editAppCat = {};
|
||||
|
|
Loading…
Reference in New Issue