Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
lucemans committed Dec 4, 2024
1 parent b217cbf commit a780d46
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Migrate db
working-directory: ./engine
run: cargo install sqlx-cli --no-default-features --features native-tls,postgres && sqlx migrate run && sqlx migrate prepare
run: cargo install sqlx-cli --no-default-features --features native-tls,postgres && sqlx migrate run && sqlx prepare


- name: Stop postgres via docker-compose dev
Expand Down
10 changes: 1 addition & 9 deletions engine/.build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ RUN groupadd -g 10001 -r dockergrp && useradd -r -g dockergrp -u 10001 dockeruse
ARG BINARY_NAME_DEFAULT
ENV BINARY_NAME=$BINARY_NAME_DEFAULT

ARG DATABASE_URL
ENV DATABASE_URL=$DATABASE_URL

# Build the project with target x86_64-unknown-linux-musl

# Build dummy main with the project's Cargo lock and toml
Expand All @@ -26,12 +23,7 @@ COPY src ./src
COPY migrations ./migrations
COPY .sqlx ./sqlx

RUN echo "DATABASE_URL=$DATABASE_URL"

# Debugging: Print the DATABASE_URL to verify it's being set
RUN echo "DATABASE_URL during build: $DATABASE_URL"

RUN set -x && DATABASE_URL=$DATABASE_URL cargo build --target x86_64-unknown-linux-musl --release
RUN set -x && cargo build --target x86_64-unknown-linux-musl --release
RUN mkdir -p /build-out
RUN set -x && cp target/x86_64-unknown-linux-musl/release/$BINARY_NAME /build-out/

Expand Down

0 comments on commit a780d46

Please sign in to comment.