Skip to content

Commit cdef9bf

Browse files
committed
fix: replace dotenv! macro with env::var() for crates.io publishing
Replace compile-time dotenv! macro with runtime env::var() to fix publishing errors. The dotenv! macro requires a .env file at compile time which isn't available during cargo publish. Using env::var() reads from environment variables at runtime instead.
1 parent 0338e12 commit cdef9bf

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,8 @@ jobs:
5757
core.setOutput('crates-release', hasCrates ? 'true' : 'false');
5858
core.setOutput('prerelease', hasPrerelease ? 'true' : 'false');
5959
60-
publish-shared:
61-
needs: check-labels
62-
if: needs.check-labels.outputs.crates-release == 'true'
63-
uses: photon-hq/buildspace/.github/workflows/publish-crates.yml@main
64-
with:
65-
crate-name: enva-shared
66-
crate-path: crates/shared
67-
secrets: inherit
68-
6960
release:
70-
needs: [check-labels, publish-shared]
71-
if: always() && (needs.publish-shared.result == 'success' || needs.publish-shared.result == 'skipped')
61+
needs: [check-labels]
7262
uses: photon-hq/buildspace/.github/workflows/rust-service-release.yaml@main
7363
permissions:
7464
contents: write

crates/client/src/endpoints.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::utils::get_token;
2-
use dotenvy_macro::dotenv;
32
use log::{error};
43
use reqwest::{Error, Response};
54
use enva_shared::models::{CommitRequest, CommitResponse, FetchRequest, FetchResponse};
65
use serde::de::DeserializeOwned;
6+
use std::env;
77

88
async fn parse_response<T: DeserializeOwned>(res: Result<Response, Error>) -> Option<T> {
99
match res {
@@ -31,9 +31,10 @@ async fn parse_response<T: DeserializeOwned>(res: Result<Response, Error>) -> Op
3131

3232
pub async fn call_commit(req: CommitRequest) -> Option<CommitResponse> {
3333
let client = reqwest::Client::new();
34+
let base_url = env::var("BASE_URL").expect("BASE_URL environment variable must be set");
3435

3536
let res = client
36-
.post(format!("{}/commit", dotenv!("BASE_URL"))) // Adjust URL/Port
37+
.post(format!("{}/commit", base_url))
3738
.bearer_auth(get_token().expect("Failed to get token"))
3839
.json(&req)
3940
.send()
@@ -44,9 +45,10 @@ pub async fn call_commit(req: CommitRequest) -> Option<CommitResponse> {
4445

4546
pub async fn call_fetch(req: FetchRequest) -> Option<FetchResponse> {
4647
let client = reqwest::Client::new();
48+
let base_url = env::var("BASE_URL").expect("BASE_URL environment variable must be set");
4749

4850
let res = client
49-
.post(format!("{}/fetch", dotenv!("BASE_URL"))) // Adjust URL/Port
51+
.post(format!("{}/fetch", base_url))
5052
.bearer_auth(get_token().expect("Failed to get token"))
5153
.json(&req)
5254
.send()

0 commit comments

Comments
 (0)