Merge pull request #100 from chatsen/master

Fix the endpoint for flutter releases

dist/index.js

@@ -123,9 +123,14 @@ function getFlutter(version, channel) {
             toolPath = yield tc.cacheDir(sdkDir, 'flutter', cleanver);
         }
         core.exportVariable('FLUTTER_ROOT', toolPath);
+        let pubCachePath = process.env['PUB_CACHE'] || '';
+        if (!pubCachePath) {
+            pubCachePath = path.join(toolPath, '.pub-cache');
+            core.exportVariable('PUB_CACHE', pubCachePath);
+        }
         core.addPath(path.join(toolPath, 'bin'));
         core.addPath(path.join(toolPath, 'bin', 'cache', 'dart-sdk', 'bin'));
-        core.addPath(path.join(toolPath, '.pub-cache', 'bin'));
+        core.addPath(path.join(pubCachePath, 'bin'));
         if (useMaster) {
             yield exec.exec('flutter', ['channel', 'master']);
             yield exec.exec('flutter', ['upgrade']);
@@ -226,7 +231,7 @@ exports.determineVersion = exports.getPlatform = exports.storageUrl = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const httpm = __importStar(__nccwpck_require__(9925));
 const semver = __importStar(__nccwpck_require__(1383));
-exports.storageUrl = 'https://storage.googleapis.com/flutter_infra/releases';
+exports.storageUrl = 'https://storage.googleapis.com/flutter_infra_release/releases';
 function getPlatform() {
     const platform = process.platform;
     if (platform == 'win32') {

package-lock.json

@@ -2491,9 +2491,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.7.1",
+      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "html-encoding-sniffer": {

src/installer.ts

@@ -46,9 +46,17 @@ export async function getFlutter(
   }
 
   core.exportVariable('FLUTTER_ROOT', toolPath);
+
+  let pubCachePath = process.env['PUB_CACHE'] || '';
+
+  if (!pubCachePath) {
+    pubCachePath = path.join(toolPath, '.pub-cache');
+    core.exportVariable('PUB_CACHE', pubCachePath);
+  }
+
   core.addPath(path.join(toolPath, 'bin'));
   core.addPath(path.join(toolPath, 'bin', 'cache', 'dart-sdk', 'bin'));
-  core.addPath(path.join(toolPath, '.pub-cache', 'bin'));
+  core.addPath(path.join(pubCachePath, 'bin'));
 
   if (useMaster) {
     await exec.exec('flutter', ['channel', 'master']);

src/release.ts

@@ -3,7 +3,7 @@ import * as httpm from '@actions/http-client';
 import * as semver from 'semver';
 
 export const storageUrl =
-  'https://storage.googleapis.com/flutter_infra/releases';
+  'https://storage.googleapis.com/flutter_infra_release/releases';
 
 interface IFlutterData {
   channel: string;