Skip to content

Commit

Permalink
Merge branch 'release/v2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
julien1619 committed Oct 26, 2020
2 parents f69a1d4 + 66b4d76 commit 086ac4d
Show file tree
Hide file tree
Showing 56 changed files with 3,282 additions and 1,395 deletions.
5 changes: 4 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
RUST_LOG=api=trace
RUST_LOG=sirene=debug
SIRENE_ENV=development
HOST=localhost
PORT=3000
BASE_URL=http://localhost:3000
API_KEY=
DATABASE_URL=postgresql://sirene:[email protected]:5432/sirene
DATABASE_POOL_SIZE=100
TEMP_FOLDER=./data/temp
FILE_FOLDER=./data/files
DB_FOLDER=./data/files
INSEE_CREDENTIALS=Base64(consumer-key:consumer-secret)
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2
updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
target-branch: develop
reviewers:
- julien1619
assignees:
- julien1619
47 changes: 32 additions & 15 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,39 @@ on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Install minimal nightly
uses: actions-rs/toolchain@v1
- name: Checkout repository
uses: actions/checkout@v2
- name: Caching
uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-musl-${{ hashFiles('**/Cargo.lock') }}
- name: Build for MUSL
run: |
mkdir -p ~/.cargo/{git,registry}
docker pull clux/muslrust:stable
docker run \
-v ~/.cargo/registry:/root/.cargo/registry \
-v ~/.cargo/git:/root/.cargo/git \
-v $GITHUB_WORKSPACE:/volume \
--rm -t clux/muslrust:stable \
sh -c "/volume/build-musl.sh && chown -R $(id -u):$(id -g) ./target /root/.cargo/registry /root/.cargo/git"
- name: Archive production artifact
uses: actions/upload-artifact@v2
with:
name: sirene
path: dist/sirene
- name: Push to Docker Hub
uses: docker/build-push-action@v1
with:
toolchain: nightly
profile: minimal
override: true
- name: Build
uses: actions-rs/cargo@v1
with:
command: build
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
path: "./dist"
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: creatiwity/siren
tag_with_ref: true
48 changes: 0 additions & 48 deletions .travis.yml

This file was deleted.

9 changes: 9 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

// List of extensions which should be recommended for users of this workspace.
"recommendations": ["matklad.rust-analyzer"],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
}
44 changes: 44 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'sirene' serve",
"cargo": {
"args": [
"build",
"--bin=sirene",
"--package=sirene"
],
"filter": {
"name": "sirene",
"kind": "bin"
}
},
"args": ["serve"],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'sirene' update all",
"cargo": {
"args": [
"build",
"--bin=sirene",
"--package=sirene"
],
"filter": {
"name": "sirene",
"kind": "bin"
}
},
"args": ["update", "all"],
"cwd": "${workspaceFolder}"
}
]
}
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"editor.codeActionsOnSave": {
"source.fixAll": true,
"source.organizeImports": true
}
}
Loading

0 comments on commit 086ac4d

Please sign in to comment.