From 43c3ca597032f3e03c9d19b28b31415989bf54c5 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Fri, 17 Feb 2023 18:27:43 +0530 Subject: [PATCH 1/5] Prepare for next release - Update Helm Chart with option for PVCs - Add GH action to build an image and push to GHCR --- .github/workflows/build.yaml | 41 ++++++++++++++++++++++++++---- Cargo.lock | 2 +- helm-releases/collector-0.0.1.tgz | Bin 2580 -> 2580 bytes helm-releases/parseable-0.2.2.tgz | Bin 0 -> 2518 bytes helm/Chart.yaml | 4 +-- helm/templates/data-pvc.yaml | 22 ++++++++++++++++ helm/templates/deployment.yaml | 16 ++++++++++-- helm/templates/stage-pvc.yaml | 22 ++++++++++++++++ helm/values.yaml | 15 ++++++++--- index.yaml | 36 ++++++++++++++++---------- server/Cargo.toml | 2 +- 11 files changed, 133 insertions(+), 27 deletions(-) create mode 100644 helm-releases/parseable-0.2.2.tgz create mode 100644 helm/templates/data-pvc.yaml create mode 100644 helm/templates/stage-pvc.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d9106d3e3..2ceb5aa41 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -22,14 +22,45 @@ jobs: # if: always() # run: docker-compose -f "docker-compose.yaml" down - docker-build: - name: Docker build + # docker-build: + # name: Docker build + # runs-on: ubuntu-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # - name: Build Docker image + # run: docker build . + + build-and-push-image: runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: - - name: Checkout + - name: Checkout repository uses: actions/checkout@v3 - - name: Build Docker image - run: docker build . + + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + push: true + tags: "edge" + labels: ${{ steps.meta.outputs.labels }} unit-tests: name: Unit tests diff --git a/Cargo.lock b/Cargo.lock index 8690c0d3b..7e2a141cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2770,7 +2770,7 @@ dependencies = [ [[package]] name = "parseable" -version = "0.2.1" +version = "0.2.2" dependencies = [ "actix-cors", "actix-files", diff --git a/helm-releases/collector-0.0.1.tgz b/helm-releases/collector-0.0.1.tgz index bbf2c0f06fa36f3a112599c05a1c058a5c225593..842f09c323fcc1d7bcaf1a4a5e599febc7794671 100644 GIT binary patch delta 2513 zcmV;?2`=`O6qFQ@Jb&wR+_v%l%)erPlrxj~=i@zeI=MHK53cOCp8BD&QfE4uj0Z>V z@eqLk1Au2=Wc6?F0N?}U@g!MNr6v_V=ty9(yI5eKpkl!o##+eX(TYeNZAiu*-Etd^ zMx)tuYJW$gQTKN=8BHIJr~8Ndv%~3hGJP}}?~f11k6?7$jDPgCLTMr&jc!b8L=))k3SG>XQ-eaql~xi$K~Cagg9pD+NI=>K?jc+l1V>2&&_ z|98>$_TYyVReul*zNBd(Q2~JjGhq}K^onQ*_Vyq}j*@6pAPG-I227+10s}Y?z`&Xx zfLJ2YI0r2Yv>nbE7`Oq+^SVprB)0uaQZQ}18Cf7x4voVIsheaNXbjD3k)CKFv1B>O ztC5ci`EkAxwL^Nl1d^_A$r9%$~9qg7>`tY=r2-ab13_E3emJ& zBqvxh&`fBH)b+GQZr*uXkQ5DA-B}y!aWsi$on-q#a6HhaPCjgL`3q`e% zn>p0d8-F(50U$3JI~I(_n>jpZpUB3nT$6MTVHgBvQ)!IP<5(128;qSZR_>VDD8jkW zmcE+9*?ADi1&Oz&R4C1W^G!$YB)mE{+z6@X@N5(W5|t=qj8;I5W>lA=iu1y3&?vKS z8D@5Ivkmj2;K}g(JUBZW7(+ujLRg=f$UuiMXvU2pg2<&3Zw;#Gg9|GR;EM`2kowt-&@!swD>VttjN z5CuP?!)@WUp2LblrdPKaV`lE<6RB&CASxd)RI=_;+TvD!=5PqWu z->9&I%Mrc$0qcKk9XoG7jh2-D(Cnq%)AE2gDCkr?RAMd z@=i>-(C2mTX~syNN2j%(MpO*zK;-PKXUZ4&wGbLR3*W|)5l&J}28)eDRGpp^7Zmgg zuJXuN5M6hjgI*?F%+fC@r}R-j_kWZtO?ZrL-hI{TJHcJUUIsuwTu^0VMNwH~&A_Kb$?pe|OPZ^}lg&N_jGeBYObekUYpxlZ0q8uM@3)qvh$Z(SN0OYH5wc z_8eBbf-k@+PfQXyHM1*%;2p#{d>Od>dEkD#d9@*;#Xm{LYV~g?<54rCOYpuo;T~I` z{x?be?bv`z^#5Qs>(>8g`;&tQ{lAOm>p#hJHLQ)mi~1DYj}&%+7m{F_Y>8tnzwcZ$f2E9VORVzErs9DWK11LuUpr=jPK!=F9SwO~btZ_Jh`f1Q<>+`NGUYsn!q zbB>8#&A|^kTQCwy@{Y5Occ)OxxLCN!{d4O>S{0YKMAB5A+agB3-rg`tc#81&6gN-d zvAryV`S(y`M80k#X@8v)Gp#!eV6oV7owEw*V?UMcGSO0;HkIR#|9Jm;CxQChcWz6f zLb3}mp1gej_W7Ha*Fam|rR>Ii{QTtP$9L~vd_C^!KBkR37qWf+8e%K0^A4F>uaB#G ze|tQaLW@|iIs9;R?2WZ91=@Sl(dZg-hb}vPsPSB^EpZi*`+sD=$`wPOh4-%;8nD(S z#7!*w7QN~=!*hz&{l=}*@h(alDF624den@lmw><4bP~)&MDo09_mT0#o^20bsUj2U zpuG6D7nQD+{(m>4Je4HNP!5+&r1fy^IG5qm@E0X`_%s|O;nQ%U%#(SYj7H|s_o5x+ zHQ2UKU{0S~!fnR?efghUkoY#g1G((`kI7`#t^bUslZX88E?TF6Yq!2B+xj-l4v|8y zgrvV&Ga8*fbA|c3ZshLK-wTFU&KY;c^s->iI}U*4^nb5X6uGCNp$k^G-0=W%k*LY}*u!d0>O1!H3l2H@B^X@OoB@0R!QuMcXk zAqB(txHQ~vZ|b!vS37ut>>g_I_tE<7f4Psh<^nFO{~sJ2cJ2Rc^zi-fowVNie`#;- zx9;aY&6BJMC4a9`bNlbSX}CcD%iH0bn}JL9f9w1I!}0Xt{_jrOl`ilHolvlAD5}8Z z#-Y#6EJsh$*jW$h*5$Wq@;g#V5C0$Q%YjD!qZP7@rd&w8Wg3_2|Ni#(|D%WdzdLDr za7?sD$rWe;Zu{ZW3OOta%1q`1If+k6iYf}q{}oV0Zht*5s1-5>DH97bd61n)T8fZ%qfVF_}Sz$nKkh+dq0v|s%P zdr*GH_TlIR5-L>?rBn~?U&nqBEq;?j`?u;?r9<~f@rN`k>K!m bZ5STfLwjg{`1bDr0096067(Sr06YKyN6`B9 delta 2512 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 literal 0 HcmV?d00001 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 6419c8b92..9939a4d7e 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: parseable description: Helm chart for Parseable Server type: application -version: 0.2.1 -AppVersion: "v0.2.1" +version: 0.2.2 +AppVersion: "v0.2.2" diff --git a/helm/templates/data-pvc.yaml b/helm/templates/data-pvc.yaml new file mode 100644 index 000000000..57feb73bc --- /dev/null +++ b/helm/templates/data-pvc.yaml @@ -0,0 +1,22 @@ +{{- if .Values.parseable.persistence.data.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "parseable.fullname" . }}-data-pvc + labels: + {{- include "parseable.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.parseable.persistence.data.accessMode | quote }} + resources: + requests: + storage: {{ .Values.parseable.persistence.data.size | quote }} + {{- if .Values.parseable.persistence.storageClass }} + storageClassName: "{{ .Values.parseable.persistence.storageClass }}" + {{- else }} + storageClassName: "" + {{- end }} + {{- if .Values.parseable.persistence.VolumeName }} + volumeName: "{{ .Values.parseable.persistence.VolumeName }}" + {{- end }} +{{- end }} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index c1aa5a1b6..7bc043e62 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -64,10 +64,22 @@ spec: - mountPath: "/parseable/staging" name: stage-volume volumes: - - name: data-volume - emptyDir: {} + {{- if .Values.parseable.persistence.staging.enabled }} - name: stage-volume + persistentVolumeClaim: + claimName: {{ include "parseable.fullname" . }}-staging-pvc + {{- else }} + - name: stage-volume + emptyDir: {} + {{- end }} + {{- if .Values.parseable.persistence.data.enabled }} + - name: data-volume + persistentVolumeClaim: + claimName: {{ include "parseable.fullname" . }}-data-pvc + {{- else }} + - name: data-volume emptyDir: {} + {{- end }} {{- with .Values.parseable.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/helm/templates/stage-pvc.yaml b/helm/templates/stage-pvc.yaml new file mode 100644 index 000000000..865317988 --- /dev/null +++ b/helm/templates/stage-pvc.yaml @@ -0,0 +1,22 @@ +{{- if .Values.parseable.persistence.staging.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "parseable.fullname" . }}-staging-pvc + labels: + {{- include "parseable.labels" . | nindent 4 }} +spec: + accessModes: + - {{ .Values.parseable.persistence.staging.accessMode | quote }} + resources: + requests: + storage: {{ .Values.parseable.persistence.staging.size | quote }} + {{- if .Values.parseable.persistence.storageClass }} + storageClassName: "{{ .Values.parseable.persistence.storageClass }}" + {{- else }} + storageClassName: "" + {{- end }} + {{- if .Values.parseable.persistence.VolumeName }} + volumeName: "{{ .Values.parseable.persistence.VolumeName }}" + {{- end }} +{{- end }} diff --git a/helm/values.yaml b/helm/values.yaml index 314fed055..21280e357 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1,9 +1,20 @@ parseable: image: repository: parseable/parseable - tag: v0.2.1 + tag: v0.2.2 pullPolicy: Always local: false + persistence: + staging: + enabled: false + storageClass: "" + accessMode: ReadWriteOnce + size: 1Gi + data: + enabled: false + storageClass: "" + accessMode: ReadWriteOnce + size: 1Gi secrets: - type: env name: parseable-env-secret @@ -24,8 +35,6 @@ parseable: - s3.bucket - s3.region replicaCount: 1 - env: - RUST_LOG: "info" nameOverride: "" fullnameOverride: "" serviceAccount: diff --git a/index.yaml b/index.yaml index a7b5a4610..27fada368 100644 --- a/index.yaml +++ b/index.yaml @@ -3,18 +3,28 @@ entries: collector: - apiVersion: v2 appVersion: 4769fbf - created: "2023-02-10T11:57:57.740916+05:30" + created: "2023-02-17T18:24:43.745309+05:30" description: Helm chart for Parseable Collector - digest: 6d202987fce6705a20c4cb37a5021c80b56cb1cd7291093e8489fc1d9901b160 + digest: 9fde52a6034604b26a9420206becf9ae1a8552d33a3de5e1786e10a61bd76972 name: collector type: application urls: - https://charts.parseable.io/helm-releases/collector-0.0.1.tgz version: 0.0.1 parseable: + - apiVersion: v2 + appVersion: v0.2.2 + created: "2023-02-17T18:24:43.755647+05:30" + description: Helm chart for Parseable Server + digest: 52c0714b402ed4fa906ebc22a1549cf2f4de3612886c63b68621f938d3f8dc3b + name: parseable + type: application + urls: + - https://charts.parseable.io/helm-releases/parseable-0.2.2.tgz + version: 0.2.2 - apiVersion: v2 appVersion: v0.2.1 - created: "2023-02-10T11:57:57.750638+05:30" + created: "2023-02-17T18:24:43.75519+05:30" description: Helm chart for Parseable Server digest: 84826fcd1b4c579f301569f43b0309c07e8082bad76f5cdd25f86e86ca2e8192 name: parseable @@ -24,7 +34,7 @@ entries: version: 0.2.1 - apiVersion: v2 appVersion: v0.2.0 - created: "2023-02-10T11:57:57.750228+05:30" + created: "2023-02-17T18:24:43.75438+05:30" description: Helm chart for Parseable Server digest: 7a759f7f9809f3935cba685e904c021a0b645f217f4e45b9be185900c467edff name: parseable @@ -34,7 +44,7 @@ entries: version: 0.2.0 - apiVersion: v2 appVersion: v0.1.1 - created: "2023-02-10T11:57:57.749321+05:30" + created: "2023-02-17T18:24:43.753455+05:30" description: Helm chart for Parseable Server digest: 37993cf392f662ec7b1fbfc9a2ba00ec906d98723e38f3c91ff1daca97c3d0b3 name: parseable @@ -44,7 +54,7 @@ entries: version: 0.1.1 - apiVersion: v2 appVersion: v0.1.0 - created: "2023-02-10T11:57:57.748389+05:30" + created: "2023-02-17T18:24:43.752452+05:30" description: Helm chart for Parseable Server digest: 1d580d072af8d6b1ebcbfee31c2e16c907d08db754780f913b5f0032b403789b name: parseable @@ -54,7 +64,7 @@ entries: version: 0.1.0 - apiVersion: v2 appVersion: v0.0.8 - created: "2023-02-10T11:57:57.747429+05:30" + created: "2023-02-17T18:24:43.75145+05:30" description: Helm chart for Parseable Server digest: c805254ffa634f96ecec448bcfff9973339aa9487dd8199b21b17b79a4de9345 name: parseable @@ -64,7 +74,7 @@ entries: version: 0.0.8 - apiVersion: v2 appVersion: v0.0.7 - created: "2023-02-10T11:57:57.746429+05:30" + created: "2023-02-17T18:24:43.750504+05:30" description: Helm chart for Parseable Server digest: c591f617ed1fe820bb2c72a4c976a78126f1d1095d552daa07c4700f46c4708a name: parseable @@ -74,7 +84,7 @@ entries: version: 0.0.7 - apiVersion: v2 appVersion: v0.0.6 - created: "2023-02-10T11:57:57.745361+05:30" + created: "2023-02-17T18:24:43.749584+05:30" description: Helm chart for Parseable Server digest: f9ae56a6fcd6a59e7bee0436200ddbedeb74ade6073deb435b8fcbaf08dda795 name: parseable @@ -84,7 +94,7 @@ entries: version: 0.0.6 - apiVersion: v2 appVersion: v0.0.5 - created: "2023-02-10T11:57:57.744146+05:30" + created: "2023-02-17T18:24:43.748674+05:30" description: Helm chart for Parseable Server digest: 4d6b08a064fba36e16feeb820b77e1e8e60fb6de48dbf7ec8410d03d10c26ad0 name: parseable @@ -94,7 +104,7 @@ entries: version: 0.0.5 - apiVersion: v2 appVersion: v0.0.2 - created: "2023-02-10T11:57:57.743255+05:30" + created: "2023-02-17T18:24:43.747711+05:30" description: Helm chart for Parseable Server digest: 38a0a3e4c498afbbcc76ebfcb9cb598fa2ca843a53cc93b3cb4f135b85c10844 name: parseable @@ -104,7 +114,7 @@ entries: version: 0.0.2 - apiVersion: v2 appVersion: v0.0.1 - created: "2023-02-10T11:57:57.742303+05:30" + created: "2023-02-17T18:24:43.746832+05:30" description: Helm chart for Parseable Server digest: 1f1142db092b9620ee38bb2294ccbb1c17f807b33bf56da43816af7fe89f301e name: parseable @@ -112,4 +122,4 @@ entries: urls: - https://charts.parseable.io/helm-releases/parseable-0.0.1.tgz version: 0.0.1 -generated: "2023-02-10T11:57:57.740234+05:30" +generated: "2023-02-17T18:24:43.744546+05:30" diff --git a/server/Cargo.toml b/server/Cargo.toml index ac6082ddc..f05393437 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "parseable" -version = "0.2.1" +version = "0.2.2" authors = ["Parseable Team "] edition = "2021" rust-version = "1.67" From 1e98e4f83ab1936c60beaa8a3c17cc2a26c5ac1f Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Fri, 17 Feb 2023 18:40:34 +0530 Subject: [PATCH 2/5] temp --- .github/workflows/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2ceb5aa41..de09a0982 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,6 +8,10 @@ on: name: Parseable CI Workflow +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: # docker-compose-test: @@ -32,6 +36,7 @@ jobs: # run: docker build . build-and-push-image: + name: Build and push Docker image to GitHub Container Registry runs-on: ubuntu-latest permissions: contents: read From a2b91a42ed8ab3693c85b0dd4981f5bc370a660b Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Fri, 17 Feb 2023 18:47:22 +0530 Subject: [PATCH 3/5] temp --- .github/workflows/build.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index de09a0982..2e8fd5d63 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,3 +1,5 @@ +name: Parseable CI Workflow + on: pull_request: paths-ignore: @@ -6,8 +8,6 @@ on: - 'assets/**' - '**.md' -name: Parseable CI Workflow - env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} @@ -41,24 +41,20 @@ jobs: permissions: contents: read packages: write - steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Log in to the Container registry uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Build and push Docker image uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: From c044b15b851f9056d1aed3f9a503bcc68d7fb175 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Fri, 17 Feb 2023 23:36:25 +0530 Subject: [PATCH 4/5] temp --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2e8fd5d63..e79876100 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -60,7 +60,7 @@ jobs: with: context: . push: true - tags: "edge" + tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} unit-tests: From 047c0a001cb7a45ef394a347ad0ca78d318a695d Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Sat, 18 Feb 2023 10:31:56 +0530 Subject: [PATCH 5/5] tmep --- .../workflows/{build.yaml => build-push.yaml} | 51 +--------------- .github/workflows/ci.yaml | 61 +++++++++++++++++++ 2 files changed, 64 insertions(+), 48 deletions(-) rename .github/workflows/{build.yaml => build-push.yaml} (61%) create mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build-push.yaml similarity index 61% rename from .github/workflows/build.yaml rename to .github/workflows/build-push.yaml index e79876100..8aed27c58 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build-push.yaml @@ -1,7 +1,8 @@ -name: Parseable CI Workflow +name: Parseable Docker build and push on: - pull_request: + push: + branches: ['main'] paths-ignore: - 'docs/**' - 'helm/**' @@ -62,49 +63,3 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - unit-tests: - name: Unit tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - uses: actions-rs/cargo@v1 - with: - command: test - - fmt: - name: Rust fmt check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - run: rustup component add rustfmt - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check - - clippy: - name: Cargo Clippy check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - run: rustup component add clippy - - uses: actions-rs/cargo@v1 - with: - command: clippy - args: -- -D warnings diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 000000000..73c2fa254 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,61 @@ +name: Parseable CI Workflow + +on: + pull_request: + paths-ignore: + - 'docs/**' + - 'helm/**' + - 'assets/**' + - '**.md' + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + + unit-tests: + name: Unit tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - uses: actions-rs/cargo@v1 + with: + command: test + + fmt: + name: Rust fmt check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - run: rustup component add rustfmt + - uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check + + clippy: + name: Cargo Clippy check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + - run: rustup component add clippy + - uses: actions-rs/cargo@v1 + with: + command: clippy + args: -- -D warnings