Skip to content

Commit 5b04fc8

Browse files
committed
ci: Switch back to downloading Windows Emacs from GNU's FTP
1 parent 4181ae3 commit 5b04fc8

File tree

3 files changed

+13
-50
lines changed

3 files changed

+13
-50
lines changed

.github/workflows/integ.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,11 @@ jobs:
2424
if: runner.os != 'Windows'
2525
with:
2626
version: ${{ matrix.emacs-version }}
27-
# Seems like the Emacs archive from GNU's FTP uses its own outdated bundle of CA certs, which
28-
# wouldn't include the new LetsEncrypt's root CA cert, which is used by MELPA, among others.
29-
# So we use mingw64's Emacs instead. TODO: Switch back whenever possible.
30-
- name: Install Emacs (Windows)
27+
28+
- uses: jcs090218/setup-emacs-windows@v4
3129
if: runner.os == 'Windows'
32-
run: |
33-
$env:MSYS_PATH = "$env:CD\ci-tools\msys2"
34-
choco install msys2 --params="/InstallDir:$env:MSYS_PATH /NoPath"
35-
$env:PATH = "$env:MSYS_PATH\usr\bin;" + $env:PATH
36-
pacman -S --noconfirm --needed mingw-w64-x86_64-emacs
37-
echo "$env:MSYS_PATH\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf-8 -Append
38-
# - uses: jcs090218/setup-emacs-windows@v4
39-
# if: runner.os == 'Windows'
40-
# with:
41-
# version: ${{ matrix.emacs-version }}
30+
with:
31+
version: ${{ matrix.emacs-version }}
4232

4333
- uses: actions/checkout@v2
4434
with:

.github/workflows/main.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,11 @@ jobs:
2323
matrix:
2424
os:
2525
- macos-10.15
26-
# - ubuntu-18.04
26+
- windows-2019
2727
- ubuntu-20.04
2828
emacs-version:
29-
# - '25.3'
30-
# - '26.3'
3129
- '27.2'
3230
include:
33-
# # Older Emacs binaries for Windows don't have dynamic modules enabled.
34-
# - os: windows-2016
35-
# emacs-version: '27.2'
36-
- os: windows-2019
37-
emacs-version: '27.2'
3831
- os: macos-11
3932
emacs-version: '27.2'
4033
# Cross build
@@ -56,21 +49,11 @@ jobs:
5649
if: runner.os != 'Windows'
5750
with:
5851
version: ${{ matrix.emacs-version }}
59-
# Seems like the Emacs archive from GNU's FTP uses its own outdated bundle of CA certs, which
60-
# wouldn't include the new LetsEncrypt's root CA cert, which is used by MELPA, among others.
61-
# So we use mingw64's Emacs instead. TODO: Switch back whenever possible.
62-
- name: Install Emacs (Windows)
52+
53+
- uses: jcs090218/setup-emacs-windows@v4
6354
if: runner.os == 'Windows'
64-
run: |
65-
$env:MSYS_PATH = "$env:CD\ci-tools\msys2"
66-
choco install msys2 --params="/InstallDir:$env:MSYS_PATH /NoPath"
67-
$env:PATH = "$env:MSYS_PATH\usr\bin;" + $env:PATH
68-
pacman -S --noconfirm --needed mingw-w64-x86_64-emacs
69-
echo "$env:MSYS_PATH\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf-8 -Append
70-
# - uses: jcs090218/setup-emacs-windows@v4
71-
# if: runner.os == 'Windows'
72-
# with:
73-
# version: ${{ matrix.emacs-version }}
55+
with:
56+
version: ${{ matrix.emacs-version }}
7457

7558
- uses: actions/checkout@v2
7659
with:

.github/workflows/release.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,11 @@ jobs:
4545
if: runner.os != 'Windows'
4646
with:
4747
version: ${{ matrix.emacs-version }}
48-
# Seems like the Emacs archive from GNU's FTP uses its own outdated bundle of CA certs, which
49-
# wouldn't include the new LetsEncrypt's root CA cert, which is used by MELPA, among others.
50-
# So we use mingw64's Emacs instead. TODO: Switch back whenever possible.
51-
- name: Install Emacs (Windows)
48+
49+
- uses: jcs090218/setup-emacs-windows@v4
5250
if: runner.os == 'Windows'
53-
run: |
54-
$env:MSYS_PATH = "$env:CD\ci-tools\msys2"
55-
choco install msys2 --params="/InstallDir:$env:MSYS_PATH /NoPath"
56-
$env:PATH = "$env:MSYS_PATH\usr\bin;" + $env:PATH
57-
pacman -S --noconfirm --needed mingw-w64-x86_64-emacs
58-
echo "$env:MSYS_PATH\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf-8 -Append
59-
# - uses: jcs090218/setup-emacs-windows@v4
60-
# if: runner.os == 'Windows'
61-
# with:
62-
# version: ${{ matrix.emacs-version }}
51+
with:
52+
version: ${{ matrix.emacs-version }}
6353

6454
- uses: actions/checkout@v2
6555
with:

0 commit comments

Comments
 (0)