push

.gitea/workflows/action.yml

@@ -15,27 +15,17 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    container: rust:latest
 
     steps:
-      - name: Install Dependencies
+      - name: Setup Environment
         run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg
-          curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /tmp/nodesource.gpg
-          echo "deb [signed-by=/tmp/nodesource.gpg] https://deb.nodesource.com/node_16.x $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/nodesource.list
-          sudo apt-get update
-          sudo apt-get install -y nodejs npm
+          rustup target add $CARGO_TARGET
+          apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg && mkdir -p /etc/apt/keyrings | curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install nodejs -y && apt-get install npm -y
 
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Setup Rust Environment
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: $CARGO_TARGET
-          override: true
-
       - name: Run Test DB Script
         run: ./test_db.sh
 
@@ -56,30 +46,39 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
-    needs: build
+    container: rust:latest
 
     steps:
+      - name: Setup Environment
+        run: |
+          apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg && mkdir -p /etc/apt/keyrings | curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install nodejs -y && apt-get install npm -y
+
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Setup Rust Environment
-        uses: actions-rs/toolchain@v1
+      - name: Run Test DB Script
+        run: ./test_db.sh
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v3
         with:
-          toolchain: stable
-          override: true
+          name: build-artifacts
 
       - name: Run Tests
         run: cargo test --verbose
 
   deploy-staging:
     runs-on: ubuntu-latest
-    needs: test
+    needs: [build, test]
     if: github.ref == 'refs/heads/staging'
-
     steps:
+      - name: Setup Environment
+        run: |
+          apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg && mkdir -p /etc/apt/keyrings | curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install nodejs -y && apt-get install npm -y
+
       - name: Checkout
         uses: actions/checkout@v3
-
+      
       - name: Download Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -95,8 +94,7 @@ jobs:
           ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rotstaging'
           ssh $SSH_USER@$SSH_HOST 'rm /home/k004373/rowing-staging/db.sqlite && cp /home/k004373/rowing/db.sqlite /home/k004373/rowing-staging/db.sqlite && mkdir -p /home/k004373/rowing-staging/svelte/build && mkdir -p /home/k004373/rowing-staging/data-ergo/thirty && mkdir -p /home/k004373/rowing-staging/data-ergo/dozen && sqlite3 /home/k004373/rowing-staging/db.sqlite < /home/k004373/rowing-staging/staging-diff.sql'
           ssh $SSH_USER@$SSH_HOST 'mv  /home/k004373/rowing-staging/rot-updating /home/k004373/rowing-staging/rot'
-          ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rotstaging'  
-
+          ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rotstaging'
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           SSH_HOST: ${{ secrets.SSH_HOST }}
@@ -104,13 +102,16 @@ jobs:
 
   deploy-main:
     runs-on: ubuntu-latest
-    needs: test
+    needs: [build, test]
     if: github.ref == 'refs/heads/main'
-
     steps:
+      - name: Setup Environment
+        run: |
+          apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg && mkdir -p /etc/apt/keyrings | curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install nodejs -y && apt-get install npm -y
+
       - name: Checkout
         uses: actions/checkout@v3
-
+      
       - name: Download Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -125,8 +126,7 @@ jobs:
           ssh $SSH_USER@$SSH_HOST 'mkdir -p /home/k004373/rowing/svelte/build && mkdir -p /home/k004373/rowing/data-ergo/thirty && mkdir -p /home/k004373/rowing/data-ergo/dozen'
           ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rot'
           ssh $SSH_USER@$SSH_HOST 'mv  /home/k004373/rowing/rot-updating /home/k004373/rowing/rot'
-          ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rot'        
-
+          ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rot'
         env:
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
           SSH_HOST: ${{ secrets.SSH_HOST }}