update

sfu-db · May 9, 2024 · 05cdb53 · 05cdb53
1 parent 813d7bb
commit 05cdb53
Showing 1 changed file with 27 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -170,15 +170,16 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: actions/setup-python@v5
+        with:
+            python-version: ${{ matrix.python-version }}
+      - uses: Gr1N/setup-poetry@v8
+      - run: poetry --version
+
       - name: Install tools
         run: |
-          apt update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:deadsnakes/ppa
           apt-get update
-          apt-get install -y python${{ matrix.python-version }} python${{ matrix.python-version }}-distutils wget curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev libicu66 libkrb5-dev libclang-dev
-          ln -s `which python${{ matrix.python-version }}` /usr/bin/python
-          wget -qO- https://bootstrap.pypa.io/get-pip.py | python
+          apt-get install -y wget curl postgresql-client build-essential pkg-config libssl-dev git sqlite3 libsqlite3-dev mysql-client libmysqlclient-dev libicu66 libkrb5-dev libclang-dev
         env:
           DEBIAN_FRONTEND: noninteractive
 
@@ -194,20 +195,18 @@ jobs:
           distribution: "temurin"
           java-version: "17"
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-python-${{ matrix.python-version }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
+      # - uses: actions/cache@v4
+      #   with:
+      #     path: |
+      #       ~/.cargo/bin/
+      #       ~/.cargo/registry/index/
+      #       ~/.cargo/registry/cache/
+      #       ~/.cargo/git/db/
+      #       target/
+      #     key: ${{ runner.os }}-cargo-python-${{ matrix.python-version }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
 
       - uses: extractions/setup-just@v2
 
-      - uses: Gr1N/setup-poetry@v9
-
       - name: Seed the database
         run: just seed-db
         env:
@@ -219,17 +218,17 @@ jobs:
           MYSQL_USER: root
           MYSQL_PASSWORD: mysql
 
-      - name: Clippy linting
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --features all --all
-
-      - name: Cache venv
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pypoetry/virtualenvs
-          key: ${{ runner.os }}-${{ matrix.python-version }}-venv-${{ secrets.CACHE_VERSION }}-${{ hashFiles('connectorx-python/poetry.lock') }}
+      # - name: Clippy linting
+      #   uses: actions-rs/cargo@v1
+      #   with:
+      #     command: clippy
+      #     args: --features all --all
+
+      # - name: Cache venv
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ~/.cache/pypoetry/virtualenvs
+      #     key: ${{ runner.os }}-${{ matrix.python-version }}-venv-${{ secrets.CACHE_VERSION }}-${{ hashFiles('connectorx-python/poetry.lock') }}
 
       - name: Install python dependencies
         run: just bootstrap-python