From 0e5dca9453a53f2b58f27b983b3fe5ceb95e2db6 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 28 Aug 2021 16:37:10 +0900 Subject: [PATCH] .github/workflows, internal/uidriver/glfw: Use curl's --remote-name --- .github/workflows/steam.sh | 2 +- .github/workflows/steam.yml | 8 ++++---- internal/uidriver/glfw/input.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/steam.sh b/.github/workflows/steam.sh index 2b5fdd0e8..ee21902c1 100644 --- a/.github/workflows/steam.sh +++ b/.github/workflows/steam.sh @@ -3,7 +3,7 @@ export CGO_CFLAGS=-std=gnu99 export DISPLAY=:99.0 # Install Go -curl -L --output ${GO_FILENAME} https://golang.org/dl/${GO_FILENAME} +curl --location --remote-name https://golang.org/dl/${GO_FILENAME} rm -rf /usr/local/go && tar -C /usr/local -xzf ${GO_FILENAME} # Run X diff --git a/.github/workflows/steam.yml b/.github/workflows/steam.yml index c0ba32cc6..b3c76416b 100644 --- a/.github/workflows/steam.yml +++ b/.github/workflows/steam.yml @@ -19,14 +19,14 @@ jobs: - name: Docker build (386) run: | - curl -L --output com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.Dockerfile https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.Dockerfile - curl -L --output com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz + curl --location --remote-name https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.Dockerfile + curl --location --remote-name https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.tar.gz docker build -f com.valvesoftware.SteamRuntime.Sdk-i386-scout-sysroot.Dockerfile -t steamrt_scout_i386:latest . - name: Docker build (amd64) run: | - curl -L --output com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.Dockerfile https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.Dockerfile - curl -L --output com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.tar.gz https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.tar.gz + curl --location --remote-name https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.Dockerfile + curl --location --remote-name https://repo.steampowered.com/steamrt-images-scout/snapshots/${STEAM_RUNTIME_VERSION}/com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.tar.gz docker build -f com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.Dockerfile -t steamrt_scout_amd64:latest . - name: Docker run (386) diff --git a/internal/uidriver/glfw/input.go b/internal/uidriver/glfw/input.go index 344aa616e..601218bee 100644 --- a/internal/uidriver/glfw/input.go +++ b/internal/uidriver/glfw/input.go @@ -17,7 +17,7 @@ // +build !android // +build !ios -//go:generate curl --location --output gamecontrollerdb.txt https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt +//go:generate curl --location --remote-name https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt //go:generate file2byteslice -package glfw -input=./gamecontrollerdb.txt -output=./gamecontrollerdb.txt.go -var=gamecontrollerdbTxt package glfw