Merge pull request #520 from ocaml/fix-win-repo

Set the upstream git url as a secondary repository on Windows

Author: smorimoto

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to
 
 ## [unreleased]
 
+### Changed
+
+- Set the upstream git url as a secondary repository on Windows.
+
 ## [2.0.3]
 
 ### Added

dist/index.js

@@ -116,7 +116,7 @@ function composeCygwinCachePaths() {
   const cygwinRootSymlinkPath = path.posix.join("/cygdrive", "d", "cygwin");
   paths.push(cygwinRootSymlinkPath);
   const cygwinEncodedUri = encodeURIComponent(
-    "http://cygwin.mirror.constant.com/"
+    "https://cygwin.mirror.constant.com/"
   ).toLowerCase();
   const cygwinPackageRoot = path.join(githubWorkspace, cygwinEncodedUri);
   paths.push(cygwinPackageRoot);

dist/post/index.js

@@ -65,11 +65,11 @@ const repositories_yaml: { [key: string]: string } = yaml.parse(
 
 const platform = getPlatform();
 
-const defaultRepository =
-  platform !== Platform.Win32
-    ? "https://github.com/ocaml/opam-repository.git"
-    : "https://github.com/fdopen/opam-repository-mingw.git#opam2";
-
 export const OPAM_REPOSITORIES: [string, string][] = repositories_yaml
   ? Object.entries(repositories_yaml).reverse()
-  : [["default", defaultRepository]];
+  : platform !== Platform.Win32
+  ? [["default", "https://github.com/ocaml/opam-repository.git"]]
+  : [
+      ["upstream", "https://github.com/ocaml/opam-repository.git"],
+      ["default", "https://github.com/fdopen/opam-repository-mingw.git#opam2"],
+    ];

src/setup-ocaml/cache.ts

@@ -178,7 +178,7 @@ async function setupCygwin() {
   } else {
     core.addPath(cachedPath);
   }
-  const site = "http://cygwin.mirror.constant.com";
+  const site = "https://cygwin.mirror.constant.com";
   const packages = [
     "curl",
     "diffutils",