Skip to content

Commit

Permalink
Merge branch 'master' into feat/no-backoffice-for-api
Browse files Browse the repository at this point in the history
  • Loading branch information
quentinovega committed Nov 20, 2024
2 parents e604fc5 + a840dfd commit a12cc5b
Show file tree
Hide file tree
Showing 186 changed files with 7,179 additions and 4,205 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ jobs:
- os_name: Linux-x86_64
os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
bin: daikokucli-linux-amd64
bin: daikoku-linux-amd64
- os_name: Windows-x86_64
os: windows-latest
target: x86_64-pc-windows-msvc
bin: daikokucli-amd64.exe
bin: daikoku-amd64.exe
- os_name: macOS-x86_64
os: macOS-latest
target: x86_64-apple-darwin
bin: daikokucli-darwin-amd64
bin: daikoku-darwin-amd64
- os_name: macOS-aarch64
os: macOS-latest
target: aarch64-apple-darwin
bin: daikokucli-darwin-arm64
bin: daikoku-darwin-arm64
toolchain:
- stable
steps:
Expand All @@ -50,10 +50,10 @@ jobs:
args: "--release"
strip: true
- name: Rename binary (linux and macos)
run: mv ./cli/target/${{ matrix.platform.target }}/release/daikokucli ./cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
run: mv ./cli/target/${{ matrix.platform.target }}/release/daikoku ./cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
if: matrix.platform.os_name != 'Windows-x86_64'
- name: Rename binary (windows)
run: mv ./cli/target/${{ matrix.platform.target }}/release/daikokucli.exe ./cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
run: mv ./cli/target/${{ matrix.platform.target }}/release/daikoku.exe ./cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
if: matrix.platform.os_name == 'Windows-x86_64'
- name: Generate SHA-256
run: shasum -a 256 ./cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }} | cut -d ' ' -f 1 > ./cli/target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}.sha256
Expand All @@ -74,7 +74,5 @@ jobs:
- uses: actions/checkout@v4
- name: Build
run: cargo build --verbose --release
- name: Run tests
run: RUST_TEST_THREADS=1 cargo test --verbose
- name: Publish to crates.io
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --allow-dirty
run: cargo publish --token ${{ secrets.CARGO_REGISTRY_TOKEN }} --allow-dirty
3 changes: 0 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ jobs:
- name: build manual
id: manual
run: |
cd manual
sbt "release release-version ${{ github.event.inputs.releaseversion }}"
cd ..
sh ./scripts/build.sh manual
echo "diff=$(git diff --numstat | wc -l)" >> $GITHUB_OUTPUT
cd ..
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -647,3 +647,16 @@ We'd like to thank all the contributors who worked on this release!
- translation for validation step [#697](https://github.com/MAIF/daikoku/issues/697)
- Delete Tag, delete all the tags [#694](https://github.com/MAIF/daikoku/issues/694)

## [v18.0.0] - 2024-11-05

## :star: New Features

- API Admin can setup validity date on subscription [#728](https://github.com/MAIF/daikoku/issues/728)
- Use the CMS block for replaceable parts of an API [#646](https://github.com/MAIF/daikoku/issues/646)

## :heart: Contributors

We'd like to thank all the contributors who worked on this release!

- [@Zwiterrion](https://github.com/Zwiterrion)

Loading

0 comments on commit a12cc5b

Please sign in to comment.