Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump actions/checkout from 4.1.1 to 4.1.2 #4

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly

- package-ecosystem: devcontainers
directory: "/"
schedule:
Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.2

- name: Install dependencies
uses: awalsh128/cache-apt-pkgs-action@v1.4.2
Expand All @@ -27,6 +27,11 @@ jobs:
- name: Cache Rust Build
uses: Swatinem/rust-cache@v2.7.3

- name: Create models lib file
run: |
mkdir models/src
printf "\n" > models/src/lib.rs

- name: Check Formatting
uses: actions-rs/cargo@v1.0.3
with:
Expand All @@ -50,9 +55,20 @@ jobs:
# Deduplicate jobs from pull requests and branch pushes within the same repo.
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-latest
services:
ispyb:
image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
ports:
- 3306:3306
env:
MARIADB_ROOT_PASSWORD: rootpassword
options: >
--health-cmd "/usr/local/bin/healthcheck.sh --defaults-file=/ispyb/.my.cnf --connect"
env:
DATABASE_URL: mysql://root:rootpassword@localhost/ispyb_build
steps:
- name: Checkout source
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.2

- name: Install dependencies
uses: awalsh128/cache-apt-pkgs-action@v1.4.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
packages: write
steps:
- name: Checkout Code
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.2

- name: Generate Image Name
run: echo IMAGE_REPOSITORY=ghcr.io/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]' | tr '[_]' '[\-]') >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.1.0
Expand Down
154 changes: 154 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[workspace]
default-members = ["sessions"]
members = ["sessions"]
members = ["models", "sessions"]
resolver = "2"

[workspace.dependencies]
sea-orm = { version = "0.12.14", features = [
"runtime-tokio-rustls",
"sqlx-mysql",
] }
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@ FROM docker.io/library/rust:1.76.0-bullseye AS build
WORKDIR /app

COPY Cargo.toml Cargo.lock .
COPY models/Cargo.toml models/Cargo.toml
COPY sessions/Cargo.toml sessions/Cargo.toml

RUN mkdir sessions/src \
RUN mkdir models/src \
&& touch models/src/lib.rs \
&& mkdir sessions/src \
&& echo "fn main() {}" > sessions/src/main.rs \
&& cargo build --release

COPY . /app

RUN touch sessions/src/main.rs \
RUN touch models/src/lib.rs \
&& touch sessions/src/main.rs \
&& cargo build --release

FROM gcr.io/distroless/cc AS deploy
Expand Down
2 changes: 2 additions & 0 deletions models/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Generated Models
/src
Loading
Loading