Skip to content

Commit

Permalink
scripts,GitHubCI: remove curl as a dependency
Browse files Browse the repository at this point in the history
Now that we removed [1] NuGet.Restore.targets, and NuGet.exe
gets downloaded by Fsdk via WebClient, I don't think we need
curl anymore.

[1] 04277ed
  • Loading branch information
knocte committed Aug 16, 2023
1 parent 494caf3 commit 282e9cc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
22 changes: 15 additions & 7 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,11 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
run: |
# needed by fsx submodule
sudo apt install --yes curl
sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make fsharp nunit-console
# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -284,7 +288,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -326,7 +330,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh

Expand Down Expand Up @@ -370,7 +374,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6 mono-xbuild
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6 mono-xbuild

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -412,7 +416,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make fsharp nunit-console
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh

Expand Down Expand Up @@ -507,7 +511,11 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo apt install --yes git make curl fsharp nunit-console
run: |
# needed by fsx submodule
sudo apt install --yes curl
sudo apt install --yes git make fsharp nunit-console
# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -543,7 +551,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo apt install --yes git make curl fsharp nunit-console
run: sudo apt install --yes git make fsharp nunit-console
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh

Expand Down
3 changes: 0 additions & 3 deletions scripts/configure.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ let buildTool, legacyBuildTool, areGtkLibsAbsentOrDoesNotApply =

Process.ConfigCommandCheck ["make"] true true |> ignore

// needed by the "update-servers" Makefile target?
Process.ConfigCommandCheck ["curl"] true true |> ignore

match Process.ConfigCommandCheck ["mono"] false true with
| None ->
dotnetCmd, None, true
Expand Down

0 comments on commit 282e9cc

Please sign in to comment.