Merge pull request #47 from emacs-tree-sitter/ci

Fix CI issues caused by new LetsEncrypt root CA cert

Author: ubolonton

.azure-pipelines/main.yml

@@ -32,8 +32,13 @@ jobs:
     vmImage: $(IMAGE_NAME)
   strategy:
     matrix:
-      vs2017-win2016:
-        IMAGE_NAME: 'vs2017-win2016'
+      # XXX: Temporarily disabled due to outdated CA cert bundle. Maybe check
+      # https://docs.certifytheweb.com/docs/kb/kb-202109-letsencrypt/
+      # vs2017-win2016:
+      #   IMAGE_NAME: 'vs2017-win2016'
+      #   BUNDLE_TARGET: windows
+      windows-2019:
+        IMAGE_NAME: 'windows-2019'
         BUNDLE_TARGET: windows
       macos-10.14-emacs-27.1:
         IMAGE_NAME: 'macos-10.14'

.github/workflows/main.yml

@@ -47,10 +47,17 @@ jobs:
         if: runner.os != 'Windows'
         with:
           version: ${{ matrix.emacs-version }}
-      - uses: jcs090218/setup-emacs-windows@v4
+      # Seems like the Emacs archive from GNU's FTP uses its own outdated bundle of CA certs, which
+      # wouldn't include the new LetsEncrypt's root CA cert, which is used by MELPA, among others.
+      # So we use mingw64's Emacs instead. TODO: Switch back whenever possible.
+      - name: Install Emacs (Windows)
         if: runner.os == 'Windows'
-        with:
-          version: ${{ matrix.emacs-version }}
+        run: |
+          $env:MSYS_PATH = "$env:CD\ci-tools\msys2"
+          choco install msys2 --params="/InstallDir:$env:MSYS_PATH /NoPath"
+          $env:PATH = "$env:MSYS_PATH\usr\bin;" + $env:PATH
+          pacman -S --noconfirm --needed mingw-w64-x86_64-emacs
+          echo "$env:MSYS_PATH\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf-8 -Append
 
       - run: .github/script/setup-cask
       - run: cask install

.github/workflows/release.yml

@@ -38,10 +38,17 @@ jobs:
         if: runner.os != 'Windows'
         with:
           version: ${{ matrix.emacs-version }}
-      - uses: jcs090218/setup-emacs-windows@v4
+      # Seems like the Emacs archive from GNU's FTP uses its own outdated bundle of CA certs, which
+      # wouldn't include the new LetsEncrypt's root CA cert, which is used by MELPA, among others.
+      # So we use mingw64's Emacs instead. TODO: Switch back whenever possible.
+      - name: Install Emacs (Windows)
         if: runner.os == 'Windows'
-        with:
-          version: ${{ matrix.emacs-version }}
+        run: |
+          $env:MSYS_PATH = "$env:CD\ci-tools\msys2"
+          choco install msys2 --params="/InstallDir:$env:MSYS_PATH /NoPath"
+          $env:PATH = "$env:MSYS_PATH\usr\bin;" + $env:PATH
+          pacman -S --noconfirm --needed mingw-w64-x86_64-emacs
+          echo "$env:MSYS_PATH\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf-8 -Append
 
       - run: .github/script/setup-cask
       - run: cask install

.gitmodules

@@ -69,7 +69,7 @@
 	branch = master
 [submodule "repos/janet-simple"]
 	path = repos/janet-simple
-	url = https://codeberg.org/sogaiu/tree-sitter-janet-simple
+	url = https://github.com/sogaiu/tree-sitter-janet-simple
 	update = none
 	ignore = dirty
 	branch = master