Disable windows-2019 until sfackler/rust-openssl#2197 resolves

ZoeS17 · Mar 4, 2024 · 137683e · 137683e
1 parent 05ff903
commit 137683e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     name: ubuntu / ${{ matrix.toolchain }}
     strategy:
       matrix:
-        toolchain: [stable, beta]
+        toolchain: ['stable', 'beta']
     steps:
       - uses: actions/checkout@v4
         with:
@@ -50,28 +50,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-2019]
+        os: ['macos-latest']#, 'windows-2019']
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install OpenSSL (Windows)
-        if: runner.os == 'Windows'
-        shell: cmd
-        run: |
-          choco install openssl
-          echo "OPENSSL_DIR='C:\Program Files\OpenSSL'" >> $GITHUB_ENV
-      - name: Install mysql (Windows)
-        if: runner.os == 'Windows'
-        shell: cmd
-        run: |
-          choco install mysql
-          "C:\tools\mysql\current\bin\mysql" -e "create database ccgbot_rust; grant all on `ccgbot_rust`.* to 'root'@'localhost';" -uroot
-      - name: Set variables for mysql (Windows)
-        if: runner.os == 'Windows'
-        shell: bash
-        run: |
-          echo "MYSQLCLIENT_LIB_DIR=C:\tools\mysql\current\lib" >> $GITHUB_ENV
+      # - name: Install OpenSSL (Windows)
+      #   if: runner.os == 'Windows'
+      #   shell: cmd
+      #   run: |
+      #     choco install openssl
+      #     echo "OPENSSL_DIR='C:\Program Files\OpenSSL'" >> $GITHUB_ENV
+      # - name: Install mysql (Windows)
+      #   if: runner.os == 'Windows'
+      #   shell: cmd
+      #   run: |
+      #     choco install mysql
+      #     "C:\tools\mysql\current\bin\mysql" -e "create database ccgbot_rust; grant all on `ccgbot_rust`.* to 'root'@'localhost';" -uroot
+      # - name: Set variables for mysql (Windows)
+      #   if: runner.os == 'Windows'
+      #   shell: bash
+      #   run: |
+      #     echo "MYSQLCLIENT_LIB_DIR=C:\tools\mysql\current\lib" >> $GITHUB_ENV
       - name: Install stable
         uses: dtolnay/rust-toolchain@stable
       - name: cargo generate-lockfile

diff --git a/ccg_bot_bin/Cargo.toml b/ccg_bot_bin/Cargo.toml
@@ -31,7 +31,7 @@ tracing-log = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 toml = "0.5.9"
 twitch_oauth2 = { version = "0.12.4", features = ["client", "reqwest"] }
-rocket = "0.5.0-rc.3"
+rocket = "0.5.0"
 open = "5.0.0"
 twitch_api = { version = "0.7.0-rc.7", default-features = false, features = ["client", "eventsub", "helix", "reqwest", "typed-builder"] }
 once_cell = { version = "1.18.0", default-features = false }