Merge pull request #301 from baszalmstra/fix/windows_llvm

misc: adds logging to windows llvm install
mun-lang · Jan 19, 2021 · 6081592 · 6081592
2 parents b7a638e + 9b8cd2b
commit 6081592
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 52 deletions.
diff --git a/.github/actions/install-llvm/dist/index.js b/.github/actions/install-llvm/dist/index.js
@@ -1188,15 +1188,17 @@ async function execute(cmd) {
             let llvmPath = await execute("brew --prefix llvm@8");
             core.addPath(`${llvmPath}/bin`)   
         } else if(isWindows) {
-            let llvmCachedPath = tc.find("llvm", "8.0.1", "windows-x64");
-            if(!llvmCachedPath) {
-                let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
-                llvmCachedPath = await tc.downloadTool("https://github.com/mun-lang/llvm-package-windows/releases/download/v8.0.1/llvm-8.0.1-windows-x64-msvc16.7z")
-                    .then(downloadPath => tc.extract7z(downloadPath, null, _7zPath))
-                    .then(extractPath => tc.cacheDir(extractPath, "llvm", "8.0.1", "windows-x64"));
-            }
-            core.addPath(`${llvmCachedPath}/bin`)
-            core.exportVariable('LIBCLANG_PATH', `${llvmCachedPath}/bin`)
+            const downloadUrl = "https://github.com/mun-lang/llvm-package-windows/releases/download/v8.0.1/llvm-8.0.1-windows-x64-msvc16.7z"
+            core.info(`downloading LLVM from '${downloadUrl}'`)
+            const downloadLocation = await tc.downloadTool(downloadUrl);
+
+            core.info("succesfully downloaded llvm release, extracting...")
+            const _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
+            const llvmPath = await tc.extract7z(downloadLocation, null, _7zPath)
+
+            core.info("succesfully extracted llvm release")
+            core.addPath(`${llvmPath}/bin`)
+            core.exportVariable('LIBCLANG_PATH', `${llvmPath}/bin`)
         } else {
             core.setFailed(`unsupported platform '${process.platform}'`)
         }    
@@ -4084,7 +4086,6 @@ function _unique(values) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = __webpack_require__(835);
 const http = __webpack_require__(605);
 const https = __webpack_require__(211);
 const pm = __webpack_require__(950);
@@ -4133,7 +4134,7 @@ var MediaTypes;
  * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
  */
 function getProxyUrl(serverUrl) {
-    let proxyUrl = pm.getProxyUrl(url.parse(serverUrl));
+    let proxyUrl = pm.getProxyUrl(new URL(serverUrl));
     return proxyUrl ? proxyUrl.href : '';
 }
 exports.getProxyUrl = getProxyUrl;
@@ -4152,6 +4153,15 @@ const HttpResponseRetryCodes = [
 const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
 const ExponentialBackoffCeiling = 10;
 const ExponentialBackoffTimeSlice = 5;
+class HttpClientError extends Error {
+    constructor(message, statusCode) {
+        super(message);
+        this.name = 'HttpClientError';
+        this.statusCode = statusCode;
+        Object.setPrototypeOf(this, HttpClientError.prototype);
+    }
+}
+exports.HttpClientError = HttpClientError;
 class HttpClientResponse {
     constructor(message) {
         this.message = message;
@@ -4170,7 +4180,7 @@ class HttpClientResponse {
 }
 exports.HttpClientResponse = HttpClientResponse;
 function isHttps(requestUrl) {
-    let parsedUrl = url.parse(requestUrl);
+    let parsedUrl = new URL(requestUrl);
     return parsedUrl.protocol === 'https:';
 }
 exports.isHttps = isHttps;
@@ -4275,7 +4285,7 @@ class HttpClient {
         if (this._disposed) {
             throw new Error('Client has already been disposed.');
         }
-        let parsedUrl = url.parse(requestUrl);
+        let parsedUrl = new URL(requestUrl);
         let info = this._prepareRequest(verb, parsedUrl, headers);
         // Only perform retries on reads since writes may not be idempotent.
         let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
@@ -4314,7 +4324,7 @@ class HttpClient {
                     // if there's no location to redirect to, we won't
                     break;
                 }
-                let parsedRedirectUrl = url.parse(redirectUrl);
+                let parsedRedirectUrl = new URL(redirectUrl);
                 if (parsedUrl.protocol == 'https:' &&
                     parsedUrl.protocol != parsedRedirectUrl.protocol &&
                     !this._allowRedirectDowngrade) {
@@ -4430,7 +4440,7 @@ class HttpClient {
      * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
      */
     getAgent(serverUrl) {
-        let parsedUrl = url.parse(serverUrl);
+        let parsedUrl = new URL(serverUrl);
         return this._getAgent(parsedUrl);
     }
     _prepareRequest(method, requestUrl, headers) {
@@ -4503,7 +4513,7 @@ class HttpClient {
                 maxSockets: maxSockets,
                 keepAlive: this._keepAlive,
                 proxy: {
-                    proxyAuth: proxyUrl.auth,
+                    proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`,
                     host: proxyUrl.hostname,
                     port: proxyUrl.port
                 }
@@ -4598,12 +4608,8 @@ class HttpClient {
                 else {
                     msg = 'Failed request: (' + statusCode + ')';
                 }
-                let err = new Error(msg);
-                // attach statusCode and body obj (if available) to the error object
-                err['statusCode'] = statusCode;
-                if (response.result) {
-                    err['result'] = response.result;
-                }
+                let err = new HttpClientError(msg, statusCode);
+                err.result = response.result;
                 reject(err);
             }
             else {
@@ -4935,22 +4941,14 @@ function v4(options, buf, offset) {
 module.exports = v4;
 
 
-/***/ }),
-
-/***/ 835:
-/***/ (function(module) {
-
-module.exports = require("url");
-
 /***/ }),
 
 /***/ 950:
-/***/ (function(__unusedmodule, exports, __webpack_require__) {
+/***/ (function(__unusedmodule, exports) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = __webpack_require__(835);
 function getProxyUrl(reqUrl) {
     let usingSsl = reqUrl.protocol === 'https:';
     let proxyUrl;
@@ -4965,7 +4963,7 @@ function getProxyUrl(reqUrl) {
         proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
     }
     if (proxyVar) {
-        proxyUrl = url.parse(proxyVar);
+        proxyUrl = new URL(proxyVar);
     }
     return proxyUrl;
 }

diff --git a/.github/actions/install-llvm/index.js b/.github/actions/install-llvm/index.js
@@ -36,15 +36,17 @@ export async function execute(cmd) {
             let llvmPath = await execute("brew --prefix llvm@8");
             core.addPath(`${llvmPath}/bin`)   
         } else if(isWindows) {
-            let llvmCachedPath = tc.find("llvm", "8.0.1", "windows-x64");
-            if(!llvmCachedPath) {
-                let _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
-                llvmCachedPath = await tc.downloadTool("https://github.com/mun-lang/llvm-package-windows/releases/download/v8.0.1/llvm-8.0.1-windows-x64-msvc16.7z")
-                    .then(downloadPath => tc.extract7z(downloadPath, null, _7zPath))
-                    .then(extractPath => tc.cacheDir(extractPath, "llvm", "8.0.1", "windows-x64"));
-            }
-            core.addPath(`${llvmCachedPath}/bin`)
-            core.exportVariable('LIBCLANG_PATH', `${llvmCachedPath}/bin`)
+            const downloadUrl = "https://github.com/mun-lang/llvm-package-windows/releases/download/v8.0.1/llvm-8.0.1-windows-x64-msvc16.7z"
+            core.info(`downloading LLVM from '${downloadUrl}'`)
+            const downloadLocation = await tc.downloadTool(downloadUrl);
+
+            core.info("succesfully downloaded llvm release, extracting...")
+            const _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
+            const llvmPath = await tc.extract7z(downloadLocation, null, _7zPath)
+
+            core.info("succesfully extracted llvm release")
+            core.addPath(`${llvmPath}/bin`)
+            core.exportVariable('LIBCLANG_PATH', `${llvmPath}/bin`)
         } else {
             core.setFailed(`unsupported platform '${process.platform}'`)
         }    

diff --git a/.github/actions/install-llvm/package-lock.json b/.github/actions/install-llvm/package-lock.json
diff --git a/.github/actions/install-llvm/package.json b/.github/actions/install-llvm/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.4",
-    "@actions/tool-cache": "^1.6.0",
+    "@actions/tool-cache": "^1.6.1",
     "@zeit/ncc": "^0.22.3"
   }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,16 +45,16 @@ jobs:
         with:
           submodules: true
 
+      - name: Install LLVM
+        uses: ./.github/actions/install-llvm
+
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           override: true
           components: rustfmt
 
-      - name: Install LLVM
-        uses: ./.github/actions/install-llvm
-
       - name: Cargo build
         if: ${{ matrix.config.os == 'ubuntu-latest' }}
         uses: actions-rs/cargo@v1