get closer

tztz8 · May 31, 2023 · ce67b2f · ce67b2f
1 parent e1b0645
commit ce67b2f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -14,7 +14,8 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+#    runs-on: ubuntu-latest
+    runs-on: self-hosted
     timeout-minutes: 40
     # NOTE already has rust
     # NOTE already has openssl
@@ -25,25 +26,25 @@ jobs:
       # TODO: Does Cache work?
       # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows
       # https://github.com/marketplace/actions/cache
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-            studentpage/target/
-            adminpage/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+#      - uses: actions/cache@v3
+#        with:
+#          path: |
+#            ~/.cargo/bin/
+#            ~/.cargo/registry/index/
+#            ~/.cargo/registry/cache/
+#            ~/.cargo/git/db/
+#            target/
+#            studentpage/target/
+#            adminpage/target/
+#          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       # Takes around 8min's
-      - name: Update local toolchain (takes around 8 mins)
-        run: |
-          rustup update
-          rustup component add clippy
-          rustup target add wasm32-unknown-unknown
-          if ! command -v trunk &> /dev/null ; then cargo install --locked trunk; fi
+#      - name: Update local toolchain (takes around 8 mins)
+#        run: |
+#          rustup update
+#          rustup component add clippy
+#          rustup target add wasm32-unknown-unknown
+#          if ! command -v trunk &> /dev/null ; then cargo install --locked trunk; fi
 
       - name: Toolchain info
         run: |

diff --git a/helper_scripts/README.md b/helper_scripts/README.md
@@ -15,6 +15,10 @@ Install
 ### TODO: Need
 
 - [ ] Install libs (`openssl`)
+```shell
+sudo dnf update
+sudo dnf install openssl mariadb-connector-c
+```
 - [ ] Setup server user (`status-reports`)
 - [ ] Copy server into user (`/home/status-reports/server`)
 - [ ] Copy SSL cert into user (`/home/status-reports/server`)

diff --git a/helper_scripts/dev_rust_setup.sh b/helper_scripts/dev_rust_setup.sh
@@ -8,16 +8,20 @@ Purple='\033[0;35m'       # Purple
 echo -e "$Cyan Updating System... $Color_Off"
 sudo dnf update
 sudo dnf upgrade -y
-echo -e "$Cyan Install Development Tools, openssl-devel, mariadb-connector-c ... $Color_Off"
+echo -e "$Cyan Install Development Tools, openssl/dev, mariadb-connector-c/dev ... $Color_Off"
 sudo dnf groupinstall 'Development Tools'
-sudo dnf install openssl-devel mariadb-connector-c
+# mariadb-connector-c gives the mysql client lib
+sudo dnf install openssl openssl-devel mariadb-connector-c mariadb-connector-c-devel
 # get rustup
 echo -e "$Cyan Install rustup ... $Color_Off"
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-# TODO: run src
-echo -e "$Cyan Install clippy, wasm, trunk ... $Color_Off"
+source "$HOME/.cargo/env"
+echo -e "$Cyan Install clippy, wasm ... $Color_Off"
 rustup component add clippy
 rustup target add wasm32-unknown-unknown
+echo -e "$Cyan Install trunk ... $Color_Off"
 cargo install --locked trunk
-echo -e "$Cyan TODO: Install db ... $Color_Off"
-# TODO: install db
+echo -e "$Cyan Install db ... $Color_Off"
+cargo install diesel_cli --no-default-features --features mysql
+echo -e "$Cyan Getting project ... $Color_Off"
+git clone https://github.com/tztz8/EWU-CSCD488-490-Senior-Project.git