diff --git a/build.rs b/build.rs index 9d7faf5..c7c204c 100644 --- a/build.rs +++ b/build.rs @@ -7,6 +7,7 @@ use dotenv::dotenv; #[tokio::main] async fn main(){ + println!("cargo:rerun-if-changed=migrations"); dotenv().ok(); let mut dotenv_vars: HashMap = HashMap::new(); for (key, val) in env::vars() { @@ -14,7 +15,7 @@ async fn main(){ } let db_url = match dotenv_vars.get("DATABASE_URL") { Some(var) => {var}, - None => {panic!("Nigga damn")} + None => {panic!("DATABASE_URL env var not found, set it!")} }; let mut conn = match sqlx::MySqlConnection::connect(&db_url).await { Ok(res) => {res}, diff --git a/migrations/20220627132425_userup.sql.sql b/migrations/1_user.sql similarity index 100% rename from migrations/20220627132425_userup.sql.sql rename to migrations/1_user.sql diff --git a/migrations/20220714012938_create_databases.sql b/migrations/20220714012938_create_databases.sql deleted file mode 100644 index 9477429..0000000 --- a/migrations/20220714012938_create_databases.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Add migration script here -CREATE DATABASE IF NOT EXISTS usersvc; -USE usersvc; \ No newline at end of file diff --git a/migrations/20220627132445_tokenup.sql.sql b/migrations/2_token.sql similarity index 100% rename from migrations/20220627132445_tokenup.sql.sql rename to migrations/2_token.sql diff --git a/release-setup.sh b/release-setup.sh index 810411f..0e53d81 100755 --- a/release-setup.sh +++ b/release-setup.sh @@ -1,2 +1,6 @@ -cargo build --release -cp target/release/user-svc-actix /deploy/user-svc-actix \ No newline at end of file +export CC_x86_64_unknown_linux_gnu=x86_64-unknown-linux-gnu-gcc +export CXX_x86_64_unknown_linux_gnu=x86_64-unknown-linux-gnu-g++ +export AR_x86_64_unknown_linux_gnu=x86_64-unknown-linux-gnu-ar +export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-unknown-linux-gnu-gcc +cargo build --release --target x86_64-unknown-linux-gnu +scp target/x86_64-unknown-linux-gnu/release/user-svc-actix deploy/Dockerfile main@backend.blancoinfante.com:~/executables/user-svc/ \ No newline at end of file