From caddc6e3145ffecb3e8250e5fecdd79650312c4a Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:10:07 +0100 Subject: [PATCH 01/45] Added fmt and clippy workflow from Reveaal --- .github/workflows/test_format.yaml | 45 ++++++++++++++++++++++++++++++ Ecdar-GUI-Web | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/test_format.yaml diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml new file mode 100644 index 0000000..67d9827 --- /dev/null +++ b/.github/workflows/test_format.yaml @@ -0,0 +1,45 @@ +name: Check formatting + +on: + workflow_dispatch: + push: + +jobs: + fmt: + name: cargo fmt + runs-on: ubuntu-latest + steps: + - run: sudo apt-get install llvm protobuf-compiler + - uses: actions/checkout@v3 + with: + submodules: 'true' + - uses: dtolnay/rust-toolchain@stable + with: + components: rustfmt + - uses: Swatinem/rust-cache@v2 + with: + cache-on-failure: true + - name: cargo fmt --all + uses: clechasseur/rs-cargo@v1 + with: + command: fmt + args: --all -- --check + + clippy: + name: Clippy lint and check + runs-on: ubuntu-latest + steps: + - run: sudo apt-get install llvm protobuf-compiler + - uses: actions/checkout@v3 + with: + submodules: 'true' + - uses: dtolnay/rust-toolchain@stable + with: + components: clippy + - uses: Swatinem/rust-cache@v2 + with: + cache-on-failure: true + - name: clippy --all-targets --all-features + uses: clechasseur/rs-clippy-check@v3 + with: + args: --all-targets --all-features -- -D warnings diff --git a/Ecdar-GUI-Web b/Ecdar-GUI-Web index ad1acc1..ace2273 160000 --- a/Ecdar-GUI-Web +++ b/Ecdar-GUI-Web @@ -1 +1 @@ -Subproject commit ad1acc157fe74b3e6538cbd260e639e173d43afb +Subproject commit ace2273dc4b23648d306ee74b4b1b167f9a118df From 206a815e55e3e1dbcabafe9912bb569d601f4c0f Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:15:02 +0100 Subject: [PATCH 02/45] added glibc-sourve to workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 67d9827..7fb1f40 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler + - run: sudo apt-get install llvm protobuf-compiler glibc-source - uses: actions/checkout@v3 with: submodules: 'true' From df10599cc9ec1fe58b0feea9a2c7d569c53a57d3 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:18:11 +0100 Subject: [PATCH 03/45] added libgtk-3-dev to workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 7fb1f40..cb0302b 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev - uses: actions/checkout@v3 with: submodules: 'true' From 4d1e4a85754c8196010110adae408d6f83ffa53b Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:22:45 +0100 Subject: [PATCH 04/45] added libsoup-3.0-0 to workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index cb0302b..b53c4f4 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup-3.0-0 - uses: actions/checkout@v3 with: submodules: 'true' From 0db03f404fbde5836812157e63658ffe2307714a Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:24:49 +0100 Subject: [PATCH 05/45] changed libsoup in workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index b53c4f4..6d9a661 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup-3.0-0 + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 - uses: actions/checkout@v3 with: submodules: 'true' From 6849022e56bbb69c285e8b9cb9f1a4c29a7de15f Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:27:29 +0100 Subject: [PATCH 06/45] added webkit2gtk-driver to workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 6d9a661..98023fc 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-driver - uses: actions/checkout@v3 with: submodules: 'true' From c9c8dc989be1a9697f4e5313cedec8ef0f0f9e12 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:30:13 +0100 Subject: [PATCH 07/45] added javascriptcoregtk-4.0 to workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 98023fc..0df2d2f 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-driver + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-driver javascriptcoregtk-4.0 - uses: actions/checkout@v3 with: submodules: 'true' From b42c49b858ae23783933986f3d4ba7e387b292a3 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:32:34 +0100 Subject: [PATCH 08/45] changed webkit2gtk in workflow --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 0df2d2f..be21826 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-driver javascriptcoregtk-4.0 + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 - uses: actions/checkout@v3 with: submodules: 'true' From cfb9abaf11d4e356b41048840fba13cb9442c2f9 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:41:42 +0100 Subject: [PATCH 09/45] Added node dependencies --- .github/workflows/test_format.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index be21826..4830c26 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -30,6 +30,13 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 + - name: Set up Node ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: yarn + - name: Install dependencies + run: yarn --cwd ./Ecdar-GUI-Web install - uses: actions/checkout@v3 with: submodules: 'true' From 64d28306e3eb89d2288c468bdb33563ad855870d Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:44:54 +0100 Subject: [PATCH 10/45] added some cd to please yarn --- .github/workflows/test_format.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 4830c26..45afb91 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -30,13 +30,15 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 + - run: cd ./Ecdar-GUI-Web - name: Set up Node ${{ matrix.node-version }} uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: yarn - - name: Install dependencies - run: yarn --cwd ./Ecdar-GUI-Web install + - name: Install yarn dependencies + run: yarn install + - run: cd .. - uses: actions/checkout@v3 with: submodules: 'true' From 865a28a9623858768f9f2d1416ff296b7d2dd3ff Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:47:24 +0100 Subject: [PATCH 11/45] added submodules true to workflow --- .github/workflows/test_format.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 45afb91..71e51f2 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -31,20 +31,28 @@ jobs: steps: - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 - run: cd ./Ecdar-GUI-Web + with: + submodules: 'true' - name: Set up Node ${{ matrix.node-version }} uses: actions/setup-node@v3 with: + submodules: 'true' node-version: ${{ matrix.node-version }} cache: yarn - name: Install yarn dependencies run: yarn install + with: + submodules: 'true' - run: cd .. + with: + submodules: 'true' - uses: actions/checkout@v3 with: submodules: 'true' - uses: dtolnay/rust-toolchain@stable with: components: clippy + submodules: 'true' - uses: Swatinem/rust-cache@v2 with: cache-on-failure: true @@ -52,3 +60,4 @@ jobs: uses: clechasseur/rs-clippy-check@v3 with: args: --all-targets --all-features -- -D warnings + submodules: 'true' From b372d7a42195a3acdf1ec0663367d41c606a08ef Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:49:56 +0100 Subject: [PATCH 12/45] added git submodules to workflow --- .github/workflows/test_format.yaml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 71e51f2..307c8ad 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,30 +29,21 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 git + - run: git submodules update --init - run: cd ./Ecdar-GUI-Web - with: - submodules: 'true' - name: Set up Node ${{ matrix.node-version }} uses: actions/setup-node@v3 with: - submodules: 'true' node-version: ${{ matrix.node-version }} cache: yarn - name: Install yarn dependencies run: yarn install - with: - submodules: 'true' - run: cd .. - with: - submodules: 'true' - uses: actions/checkout@v3 - with: - submodules: 'true' - uses: dtolnay/rust-toolchain@stable with: components: clippy - submodules: 'true' - uses: Swatinem/rust-cache@v2 with: cache-on-failure: true @@ -60,4 +51,3 @@ jobs: uses: clechasseur/rs-clippy-check@v3 with: args: --all-targets --all-features -- -D warnings - submodules: 'true' From 2a17a3a0dd069e07f3ccb0170c8af946748abc86 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:51:58 +0100 Subject: [PATCH 13/45] fixed spellingmistake --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 307c8ad..7dada60 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 git - - run: git submodules update --init + - run: git submodule update --init --recursive - run: cd ./Ecdar-GUI-Web - name: Set up Node ${{ matrix.node-version }} uses: actions/setup-node@v3 From a419128ac7acf8ea3a3da21d991644a84a5589cb Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:57:04 +0100 Subject: [PATCH 14/45] moved checkout in worspace --- .github/workflows/test_format.yaml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 7dada60..f2b176b 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,25 +29,37 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 git - - run: git submodule update --init --recursive + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 + + - uses: actions/checkout@v3 + + - name: Checkout submodules + run: git submodule update --init --recursive + - run: cd ./Ecdar-GUI-Web + - name: Set up Node ${{ matrix.node-version }} uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: yarn + - name: Install yarn dependencies run: yarn install + - run: cd .. - - uses: actions/checkout@v3 + + - uses: dtolnay/rust-toolchain@stable with: components: clippy + - uses: Swatinem/rust-cache@v2 with: cache-on-failure: true + - name: clippy --all-targets --all-features uses: clechasseur/rs-clippy-check@v3 with: args: --all-targets --all-features -- -D warnings + From bc5953ace2f14e4b2039ae1c3db2ad4cb13b29b5 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 10:59:06 +0100 Subject: [PATCH 15/45] updated submodule url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9d1dde3..03c9231 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Ecdar-GUI-Web"] path = Ecdar-GUI-Web - url = git@github.com:ECDAR-AAU-SW-P5/Ecdar-GUI-Web.git + url = https://github.com/ECDAR-AAU-SW-P5/Ecdar-GUI-Web.git From eb955ec63d4e2f78f027452139527eeb9de53214 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:13:59 +0100 Subject: [PATCH 16/45] added ls for testing in workflow --- .github/workflows/test_format.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index f2b176b..144cd58 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -38,6 +38,8 @@ jobs: - run: cd ./Ecdar-GUI-Web + - run: ls + - name: Set up Node ${{ matrix.node-version }} uses: actions/setup-node@v3 with: From a651045e55f0f28a797582d4840fe5f0d7c94455 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:17:25 +0100 Subject: [PATCH 17/45] added node npm and yarn to workflow --- .github/workflows/test_format.yaml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 144cd58..4914db2 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,28 +29,17 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 node npm - uses: actions/checkout@v3 - name: Checkout submodules run: git submodule update --init --recursive - - run: cd ./Ecdar-GUI-Web - - - run: ls - - - name: Set up Node ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - cache: yarn + - run: npm i -g yarn - name: Install yarn dependencies - run: yarn install - - - run: cd .. - + run: yarn --cwd ./Ecdar-GUI-Web install - uses: dtolnay/rust-toolchain@stable with: From 3cecce3de9c55e7a3b20388391806208dc2d423a Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:18:26 +0100 Subject: [PATCH 18/45] fixed spelling mistake --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 4914db2..d06914a 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,7 +29,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 node npm + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 nodejs npm - uses: actions/checkout@v3 From b2bc00fbff067cb749de08ebc1292e9d591eec1f Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:20:35 +0100 Subject: [PATCH 19/45] added node go npm install --- .github/workflows/test_format.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index d06914a..4727651 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -29,14 +29,14 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 nodejs npm + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 npm - uses: actions/checkout@v3 - name: Checkout submodules run: git submodule update --init --recursive - - run: npm i -g yarn + - run: npm i -g yarn node - name: Install yarn dependencies run: yarn --cwd ./Ecdar-GUI-Web install From 62d7b0796c5ef404b6a2fe1796e535e9ac9efcad Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:22:56 +0100 Subject: [PATCH 20/45] force upgrade node --- .github/workflows/test_format.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 4727651..0962d36 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -36,7 +36,7 @@ jobs: - name: Checkout submodules run: git submodule update --init --recursive - - run: npm i -g yarn node + - run: npm i -g --force yarn node - name: Install yarn dependencies run: yarn --cwd ./Ecdar-GUI-Web install From 231f1e491e205ce57a5c38349c4f48b9a39ba4a2 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:27:07 +0100 Subject: [PATCH 21/45] fixed unused package in submodule --- Ecdar-GUI-Web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ecdar-GUI-Web b/Ecdar-GUI-Web index ace2273..5b62d43 160000 --- a/Ecdar-GUI-Web +++ b/Ecdar-GUI-Web @@ -1 +1 @@ -Subproject commit ace2273dc4b23648d306ee74b4b1b167f9a118df +Subproject commit 5b62d437fb96d2b0820bd82236b01b6c17df2706 From 2c3a8eee2a4c822f11daa5f764243d73acd34a89 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Fri, 1 Dec 2023 11:35:04 +0100 Subject: [PATCH 22/45] Updated clippy workflow --- .github/workflows/test_format.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 0962d36..a86c7fe 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -50,7 +50,8 @@ jobs: cache-on-failure: true - name: clippy --all-targets --all-features - uses: clechasseur/rs-clippy-check@v3 + uses: actions-rs/clippy-check@v1 with: + token : ${{ secrets.GITHUB_TOKEN }} args: --all-targets --all-features -- -D warnings From 2873e2d309619cc153f510d13847293109c97419 Mon Sep 17 00:00:00 2001 From: KamyaPA Date: Mon, 4 Dec 2023 14:30:32 +0100 Subject: [PATCH 23/45] removed --all-features --- .github/workflows/test_format.yaml | 2 +- Ecdar-GUI-Web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index a86c7fe..a7693e8 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -53,5 +53,5 @@ jobs: uses: actions-rs/clippy-check@v1 with: token : ${{ secrets.GITHUB_TOKEN }} - args: --all-targets --all-features -- -D warnings + args: --all-targets -- -D warnings diff --git a/Ecdar-GUI-Web b/Ecdar-GUI-Web index 5b62d43..28a0b34 160000 --- a/Ecdar-GUI-Web +++ b/Ecdar-GUI-Web @@ -1 +1 @@ -Subproject commit 5b62d437fb96d2b0820bd82236b01b6c17df2706 +Subproject commit 28a0b340a8996f8877b017aa7f52ddad6658d942 From f20629703dd7114b42f0868ad562ead1bf6b24f5 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 14:47:05 +0100 Subject: [PATCH 24/45] Ensure safe permissions --- .github/workflows/test_format.yaml | 7 ++++++- Ecdar-GUI-Web | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index a7693e8..b0e880c 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -1,8 +1,13 @@ name: Check formatting on: - workflow_dispatch: push: + branches: [main] + pull_request: + branches: [main] + +permissions: + contents: read jobs: fmt: diff --git a/Ecdar-GUI-Web b/Ecdar-GUI-Web index 28a0b34..7b93e3f 160000 --- a/Ecdar-GUI-Web +++ b/Ecdar-GUI-Web @@ -1 +1 @@ -Subproject commit 28a0b340a8996f8877b017aa7f52ddad6658d942 +Subproject commit 7b93e3f8f03a538fb992c86fcbe53eafda5deed2 From 63339275991665b0977a1f8589692d0dcb091ac7 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 14:59:37 +0100 Subject: [PATCH 25/45] what happens --- .github/workflows/test_format.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index b0e880c..d6b620e 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -14,21 +14,14 @@ jobs: name: cargo fmt runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler + - run: sudo apt-get install protobuf-compiler - uses: actions/checkout@v3 with: - submodules: 'true' - - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt + submodules: true - uses: Swatinem/rust-cache@v2 with: - cache-on-failure: true - - name: cargo fmt --all - uses: clechasseur/rs-cargo@v1 - with: - command: fmt - args: --all -- --check + cache-on-failure: false + - run: cargo fmt --all -- --check clippy: name: Clippy lint and check From 4cbf31590755d6cd67e97cbcadb4f9e138905da2 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:02:53 +0100 Subject: [PATCH 26/45] what happens --- .github/workflows/test_format.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index d6b620e..6066c7c 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -14,13 +14,10 @@ jobs: name: cargo fmt runs-on: ubuntu-latest steps: - - run: sudo apt-get install protobuf-compiler - uses: actions/checkout@v3 with: submodules: true - uses: Swatinem/rust-cache@v2 - with: - cache-on-failure: false - run: cargo fmt --all -- --check clippy: From f3178da3c84a9d0e1dc8d795e0c02f3047dd9910 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:04:51 +0100 Subject: [PATCH 27/45] what happens --- .github/workflows/test_format.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 6066c7c..e8669e5 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -17,7 +17,6 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check clippy: From ab4f67ab17ddf2adc9e113003897df7072405a38 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:06:56 +0100 Subject: [PATCH 28/45] Finalize the cargo fmt check --- .github/workflows/test_format.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index e8669e5..f2d6599 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -11,12 +11,13 @@ permissions: jobs: fmt: - name: cargo fmt + name: cargo fmt check runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: submodules: true + - uses: Swatinem/rust-cache@v2 - run: cargo fmt --all -- --check clippy: From 6c1e8018268163f455d659f7e9d364d5c745a540 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:09:46 +0100 Subject: [PATCH 29/45] Update checkout version --- .github/workflows/test_format.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index f2d6599..e6343e4 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -14,7 +14,7 @@ jobs: name: cargo fmt check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - uses: Swatinem/rust-cache@v2 @@ -26,7 +26,9 @@ jobs: steps: - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 npm - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + submodules: true - name: Checkout submodules run: git submodule update --init --recursive From 7969598ed263617e06eee20f2d59792985510a0d Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:21:33 +0100 Subject: [PATCH 30/45] what happens --- .github/workflows/test_format.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index e6343e4..42b1e9c 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -28,10 +28,13 @@ jobs: - uses: actions/checkout@v4 with: - submodules: true + submodules: true - - name: Checkout submodules - run: git submodule update --init --recursive + - name: Set up Node LTS + uses: actions/setup-node@v4 + with: + node-version: lts/* + cache: yarn - run: npm i -g --force yarn node From 38c2206bed591484aafa2b524d8a52c92bcdb506 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:22:41 +0100 Subject: [PATCH 31/45] what happens --- .github/workflows/test_format.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 42b1e9c..0c8112e 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -24,7 +24,7 @@ jobs: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 npm + - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 - uses: actions/checkout@v4 with: @@ -36,10 +36,8 @@ jobs: node-version: lts/* cache: yarn - - run: npm i -g --force yarn node - - name: Install yarn dependencies - run: yarn --cwd ./Ecdar-GUI-Web install + run: cd Ecdar-GUI-Web && yarn install - uses: dtolnay/rust-toolchain@stable with: From c9a9ed3e09c33a9b451a562f294744a1b81e9c85 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:25:40 +0100 Subject: [PATCH 32/45] fix cache path maybe --- .github/workflows/test_format.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 0c8112e..f03cf54 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -35,6 +35,7 @@ jobs: with: node-version: lts/* cache: yarn + cache-dependency-path: 'Ecdar-GUI-Web/yarn.lock' - name: Install yarn dependencies run: cd Ecdar-GUI-Web && yarn install From 95017e76d76450df1f688768f160ee2ec9a3a2fc Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:29:04 +0100 Subject: [PATCH 33/45] fix cache path maybe --- .github/workflows/test_format.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index f03cf54..7be3f26 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -17,7 +17,9 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - uses: Swatinem/rust-cache@v2 + - run: cargo fmt --all -- --check clippy: @@ -30,6 +32,8 @@ jobs: with: submodules: true + - uses: Swatinem/rust-cache@v2 + - name: Set up Node LTS uses: actions/setup-node@v4 with: @@ -40,14 +44,6 @@ jobs: - name: Install yarn dependencies run: cd Ecdar-GUI-Web && yarn install - - uses: dtolnay/rust-toolchain@stable - with: - components: clippy - - - uses: Swatinem/rust-cache@v2 - with: - cache-on-failure: true - - name: clippy --all-targets --all-features uses: actions-rs/clippy-check@v1 with: From bfb7e12817c3b8d283a31c11b354c36f2e115658 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:33:14 +0100 Subject: [PATCH 34/45] what happens --- .github/workflows/test_format.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 7be3f26..e0ed4ee 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -44,9 +44,4 @@ jobs: - name: Install yarn dependencies run: cd Ecdar-GUI-Web && yarn install - - name: clippy --all-targets --all-features - uses: actions-rs/clippy-check@v1 - with: - token : ${{ secrets.GITHUB_TOKEN }} - args: --all-targets -- -D warnings - + - run: clippy --all-targets -- -D warnings From 9145369eca754931a3f20cef00565ca92255e156 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:36:13 +0100 Subject: [PATCH 35/45] what happens --- .github/workflows/test_format.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index e0ed4ee..3f17f42 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -34,7 +34,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - - name: Set up Node LTS + - name: Set up Node uses: actions/setup-node@v4 with: node-version: lts/* @@ -43,5 +43,8 @@ jobs: - name: Install yarn dependencies run: cd Ecdar-GUI-Web && yarn install + + - name: Set up Clippy + run: rustup component add clippy - run: clippy --all-targets -- -D warnings From 51d516897dc710035cbf9d758f17ec45e2a00388 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:38:22 +0100 Subject: [PATCH 36/45] what happens --- .github/workflows/test_format.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 3f17f42..f3cf4f5 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -45,6 +45,8 @@ jobs: run: cd Ecdar-GUI-Web && yarn install - name: Set up Clippy - run: rustup component add clippy + run: | + rustup component add clippy + export PATH=$PATH:$HOME/.cargo/bin - run: clippy --all-targets -- -D warnings From f41276cb52dd91882a00a0244c782caf37b71b49 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:39:54 +0100 Subject: [PATCH 37/45] what happens --- .github/workflows/test_format.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index f3cf4f5..27d579c 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -43,10 +43,5 @@ jobs: - name: Install yarn dependencies run: cd Ecdar-GUI-Web && yarn install - - - name: Set up Clippy - run: | - rustup component add clippy - export PATH=$PATH:$HOME/.cargo/bin - - run: clippy --all-targets -- -D warnings + - run: cargo clippy --all-targets -- -D warnings From 90fc836cb85df5591c09571a1bb12a8807d8f3a3 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:43:05 +0100 Subject: [PATCH 38/45] what happens --- .github/workflows/test_format.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 27d579c..64d42ea 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -20,13 +20,14 @@ jobs: - uses: Swatinem/rust-cache@v2 - - run: cargo fmt --all -- --check + - name: Run fmt lint + run: cargo fmt --all -- --check clippy: name: Clippy lint and check runs-on: ubuntu-latest steps: - - run: sudo apt-get install llvm protobuf-compiler glibc-source libgtk-3-dev libsoup2.4 webkit2gtk-4.0 javascriptcoregtk-4.0 + - run: sudo apt-get install protobuf-compiler - uses: actions/checkout@v4 with: @@ -44,4 +45,5 @@ jobs: - name: Install yarn dependencies run: cd Ecdar-GUI-Web && yarn install - - run: cargo clippy --all-targets -- -D warnings + - name: Run clippy lint + run: cargo clippy --all-targets -- -D warnings From 4135d70951c09999b32d5f6c44bd7c0f27182db5 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:44:42 +0100 Subject: [PATCH 39/45] what happens --- .github/workflows/test_format.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 64d42ea..1dc2c1f 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -11,7 +11,7 @@ permissions: jobs: fmt: - name: cargo fmt check + name: Cargo fmt lint runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -24,10 +24,9 @@ jobs: run: cargo fmt --all -- --check clippy: - name: Clippy lint and check + name: Cargo clippy lint runs-on: ubuntu-latest steps: - - run: sudo apt-get install protobuf-compiler - uses: actions/checkout@v4 with: From 41219bc62293790dc45f93b3629b4dd7690f9a00 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:45:57 +0100 Subject: [PATCH 40/45] what happens --- .github/workflows/test_format.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 1dc2c1f..f8eb54e 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -27,13 +27,10 @@ jobs: name: Cargo clippy lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 with: submodules: true - - uses: Swatinem/rust-cache@v2 - - name: Set up Node uses: actions/setup-node@v4 with: From 5ea4834245b6b7da198987f9398775a624c3da02 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 15:53:29 +0100 Subject: [PATCH 41/45] what happens --- .github/workflows/test_format.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index f8eb54e..ca2e428 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -27,6 +27,9 @@ jobs: name: Cargo clippy lint runs-on: ubuntu-latest steps: + - name: Set up native dependencies + run: sudo apt-get install libgtk-3-dev + - uses: actions/checkout@v4 with: submodules: true From 41e8cc9e6a55f7fde10c3efc147798c37f8d123b Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 19:48:49 +0100 Subject: [PATCH 42/45] Add native dependencies --- .github/workflows/test_format.yaml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index ca2e428..c419dcc 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -27,8 +27,23 @@ jobs: name: Cargo clippy lint runs-on: ubuntu-latest steps: - - name: Set up native dependencies - run: sudo apt-get install libgtk-3-dev + + # DO NOT EDIT THIS MANUALLY, please only use the official installation instructions from: + # https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux + - name: Install native Tauri dependencies + run: sudo apt-get install \ + libwebkit2gtk-4.0-dev \ + build-essential \ + curl \ + wget \ + file \ + libssl-dev \ + libgtk-3-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev + + - name: Install protobuf compiler + run: sudo apt-get install protobuf-compiler - uses: actions/checkout@v4 with: From 5a9ebfa2dc08c266dc746eb46113877b051e0dd8 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 19:51:08 +0100 Subject: [PATCH 43/45] Try this --- .github/workflows/test_format.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index c419dcc..9913b3e 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -31,8 +31,7 @@ jobs: # DO NOT EDIT THIS MANUALLY, please only use the official installation instructions from: # https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux - name: Install native Tauri dependencies - run: sudo apt-get install \ - libwebkit2gtk-4.0-dev \ + run: sudo apt-get install libwebkit2gtk-4.0-dev \ build-essential \ curl \ wget \ From 4766a6fcbe31942d463e6679ef947aaf62a9b87b Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 19:53:18 +0100 Subject: [PATCH 44/45] Try that --- .github/workflows/test_format.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 9913b3e..572ec2f 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -31,15 +31,7 @@ jobs: # DO NOT EDIT THIS MANUALLY, please only use the official installation instructions from: # https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux - name: Install native Tauri dependencies - run: sudo apt-get install libwebkit2gtk-4.0-dev \ - build-essential \ - curl \ - wget \ - file \ - libssl-dev \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - librsvg2-dev + run: sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev - name: Install protobuf compiler run: sudo apt-get install protobuf-compiler From e843a184752df64978160c8e8675f064cd6f6875 Mon Sep 17 00:00:00 2001 From: Anton Date: Mon, 4 Dec 2023 19:58:05 +0100 Subject: [PATCH 45/45] Readd caching --- .github/workflows/test_format.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_format.yaml b/.github/workflows/test_format.yaml index 572ec2f..8753f0d 100644 --- a/.github/workflows/test_format.yaml +++ b/.github/workflows/test_format.yaml @@ -40,6 +40,8 @@ jobs: with: submodules: true + - uses: Swatinem/rust-cache@v2 + - name: Set up Node uses: actions/setup-node@v4 with: