Fixing the CI failures (#1080)

This commit is contained in:
James Hodgkinson 2022-09-28 10:31:19 +10:00 committed by GitHub
parent 07e132d1d9
commit 446e06d5f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 588 additions and 630 deletions

View file

@ -2,7 +2,12 @@
name: Clippy name: Clippy
# Trigger the workflow on push or pull request # Trigger the workflow on push or pull request
"on": [push, pull_request] "on":
push:
branches-ignore:
- master
pull_request:
jobs: jobs:
clippy: clippy:
@ -26,7 +31,11 @@ jobs:
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: stable toolchain: stable
override: true
default: true
- name: "Run clippy (ignores errors, this is just a check)" - name: "Run clippy (ignores errors, this is just a check)"
run: cargo clippy --no-deps uses: actions-rs/cargo@v1
with:
command: clippy
continue-on-error: true continue-on-error: true

View file

@ -13,6 +13,12 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
default: true
- name: Update package manager - name: Update package manager
run: sudo apt-get update run: sudo apt-get update
- name: Install dependencies - name: Install dependencies

View file

@ -28,5 +28,10 @@ jobs:
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: stable toolchain: stable
- name: Build override: true
run: cargo build --verbose default: true
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose

View file

@ -27,5 +27,10 @@ jobs:
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
toolchain: stable toolchain: stable
override: true
default: true
- name: Run tests - name: Run tests
run: cargo test --verbose uses: actions-rs/cargo@v1
with:
command: test
args: --release

View file

@ -27,10 +27,15 @@ jobs:
with: with:
toolchain: stable toolchain: stable
components: cargo components: cargo
default: true
override: true
# target: wasm32-unknown-unknown # target: wasm32-unknown-unknown
- name: Install wasm-pack - name: Install wasm-pack
run: cargo install wasm-pack uses: actions-rs/cargo@v1
with:
command: install
args: wasm-pack
# https://github.com/browser-actions/setup-chrome # https://github.com/browser-actions/setup-chrome
- name: Install Chrome Headless - name: Install Chrome Headless

View file

@ -23,6 +23,7 @@ jobs:
with: with:
toolchain: stable toolchain: stable
default: true default: true
override: true
components: cargo components: cargo
- name: build - name: build
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1

View file

@ -15,7 +15,7 @@ ARG KANIDM_BUILD_PROFILE
ARG KANIDM_BUILD_OPTIONS="" ARG KANIDM_BUILD_OPTIONS=""
RUN zypper install -y \ RUN zypper install -y \
cargo rust wasm-pack \ rustup wasm-pack \
gcc clang lld \ gcc clang lld \
make automake autoconf \ make automake autoconf \
libopenssl-devel \ libopenssl-devel \
@ -25,6 +25,7 @@ RUN zypper install -y \
sccache \ sccache \
rsync rsync
RUN zypper clean -a RUN zypper clean -a
RUN rustup default stable
COPY . /usr/src/kanidm COPY . /usr/src/kanidm

View file

@ -10,8 +10,8 @@ RUN zypper dup -y
FROM repos AS builder FROM repos AS builder
RUN zypper install -y \ RUN zypper install -y \
cargo \ rustup \
rust wasm-pack \ wasm-pack \
clang lld \ clang lld \
make automake autoconf \ make automake autoconf \
libopenssl-devel pam-devel \ libopenssl-devel pam-devel \
@ -22,6 +22,7 @@ RUN zypper install -y \
findutils \ findutils \
which which
RUN zypper clean -a RUN zypper clean -a
RUN rustup default stable
COPY . /usr/src/kanidm COPY . /usr/src/kanidm

File diff suppressed because it is too large Load diff

View file

@ -14,11 +14,9 @@
"files": [ "files": [
"kanidmd_web_ui_bg.wasm", "kanidmd_web_ui_bg.wasm",
"kanidmd_web_ui.js", "kanidmd_web_ui.js",
"kanidmd_web_ui.d.ts",
"LICENSE.md" "LICENSE.md"
], ],
"module": "kanidmd_web_ui.js", "module": "kanidmd_web_ui.js",
"homepage": "https://github.com/kanidm/kanidm/", "homepage": "https://github.com/kanidm/kanidm/",
"types": "kanidmd_web_ui.d.ts",
"sideEffects": false "sideEffects": false
} }