From ea26257b67c26966f094fa5ec1e5b89cb7cb1b7f Mon Sep 17 00:00:00 2001
From: Fries <fries@getcryst.al>
Date: Fri, 4 Nov 2022 21:38:06 -0700
Subject: [PATCH] fix ci

---
 .github/workflows/test.yml | 34 ----------------------------------
 .gitlab-ci.yml             | 11 +++--------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 8b7ba5d..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Lint Code
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-env:
-  AMETHYST_CODENAME: "Clippedy Clip"
-
-jobs:
-  formatting:
-    name: cargo fmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          components: rustfmt
-      - name: Format
-        uses: actions-rust-lang/rustfmt@v1.0.0
-  clippy:
-    name: cargo clippy
-    runs-on: ubuntu-latest
-    container: ghcr.io/crystal-linux/crystal:latest
-    steps:
-      - uses: actions/checkout@v1
-      - run: |
-          sudo pacman -Syu --needed --noconfirm
-          sudo pacman -S --noconfirm rust
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90dd635..d053251 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,23 +2,18 @@ image: "archlinux:latest"
 
 cargo:version:
   before_script:
-    - pacman -Sy rustup base-devel --noconfirm
-    - rustup default stable
+    - pacman -Sy rust base-devel openssl-1.1 --noconfirm
   script:
     - rustc --version && cargo --version
 
 cargo:clippy:
   before_script:
-    - pacman -Sy rustup base-devel --noconfirm
-    - rustup default stable
-    - rustup component add clippy
+    - pacman -Sy rust base-devel openssl-1.1 --noconfirm
   script:
     - cargo clippy --no-deps -- -D clippy::all
 
 cargo:fmt:
   before_script:
-    - pacman -Sy rustup base-devel --noconfirm
-    - rustup default stable
-    - rustup component add rustfmt
+    - pacman -Sy rust base-devel openssl-1.1 --noconfirm
   script:
     - cargo fmt --check