Correcting hook feature to evaluate before removal

.github/workflows/cloud-runner-aws-pipeline.yml

@@ -59,15 +59,6 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-2
-      ## we will auth to google as well for log aggregation
-      - uses: google-github-actions/setup-gcloud@master
-        with:
-          version: '288.0.0'
-          service_account_email: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_EMAIL }}
-          service_account_key: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_KEY }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 12.x
       - run: yarn
       - run: yarn run cli --help
       - run: yarn run test-i-aws

dist/index.js

@@ -573,12 +573,12 @@ class Caching {
                         throw error;
                     });
                     archive.pipe(output);
-                    archive.directory(path_1.default.resolve(`./../${path_1.default.basename(sourceFolder)}`), false);
+                    archive.directory(path_1.default.resolve(`..`, path_1.default.basename(sourceFolder)), false);
                     archive.finalize();
                 });
                 console_1.assert(fs_1.default.existsSync(`${cacheKey}.zip`), 'cache zip exists');
                 console_1.assert(fs_1.default.existsSync(`${cacheFolder}`), 'cache folder');
-                console_1.assert(fs_1.default.existsSync(path_1.default.resolve(`./../${path_1.default.basename(sourceFolder)}`)), 'source folder exists');
+                console_1.assert(fs_1.default.existsSync(path_1.default.resolve(`..`, `${path_1.default.basename(sourceFolder)}`)), 'source folder exists');
                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`);
                 remote_client_logger_1.RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`);
                 console_1.assert(fs_1.default.existsSync(`${path_1.default.join(cacheFolder, cacheKey)}.zip`), 'cache zip exists inside cache folder');
@@ -615,7 +615,7 @@ class Caching {
                     console_1.assert(`${fs_1.default.existsSync(destinationFolder)}`);
                     yield extract_zip_1.default(`${cacheSelection}.zip`, { dir: `${destinationFolder}` });
                     process.chdir(path_1.default.basename(destinationFolder));
-                    yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${path_1.default.basename(destinationFolder)}/*" "${path_1.default.resolve(`${destinationFolder}/..`)}"`);
+                    yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${path_1.default.basename(destinationFolder)}/*" "${path_1.default.resolve(`..`, `${destinationFolder}/`)}"`);
                 }
                 else {
                     remote_client_logger_1.RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);
@@ -877,7 +877,7 @@ class SetupCloudRunnerRepository {
                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global advice.detachedHead false`);
                 remote_client_logger_1.RemoteClientLogger.log(`Cloning the repository being built:`);
                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`git lfs install --skip-smudge`);
-                yield cloud_runner_system_1.CloudRunnerSystem.Run(`git clone ${cloud_runner_state_1.CloudRunnerState.targetBuildRepoUrl} ${path_1.default.resolve(`./../${path_1.default.basename(cloud_runner_state_1.CloudRunnerState.repoPathFull)}`)}`);
+                yield cloud_runner_system_1.CloudRunnerSystem.Run(`git clone ${cloud_runner_state_1.CloudRunnerState.targetBuildRepoUrl} ${path_1.default.resolve(`..`, path_1.default.basename(cloud_runner_state_1.CloudRunnerState.repoPathFull))}`);
                 console_1.assert(fs_1.default.existsSync(`.git`));
                 remote_client_logger_1.RemoteClientLogger.log(`${cloud_runner_state_1.CloudRunnerState.buildParams.branch}`);
                 yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_state_1.CloudRunnerState.buildParams.branch}`);

src/model/cli/remote-client/remote-client-services/caching.ts

@@ -56,12 +56,12 @@ export class Caching {
           throw error;
         });
         archive.pipe(output);
-        archive.directory(path.resolve(`./../${path.basename(sourceFolder)}`), false);
+        archive.directory(path.resolve(`..`, path.basename(sourceFolder)), false);
         archive.finalize();
       });
       assert(fs.existsSync(`${cacheKey}.zip`), 'cache zip exists');
       assert(fs.existsSync(`${cacheFolder}`), 'cache folder');
-      assert(fs.existsSync(path.resolve(`./../${path.basename(sourceFolder)}`)), 'source folder exists');
+      assert(fs.existsSync(path.resolve(`..`, `${path.basename(sourceFolder)}`)), 'source folder exists');
       await CloudRunnerSystem.Run(`mv ${cacheKey}.zip ${cacheFolder}`);
       RemoteClientLogger.log(`moved ${cacheKey}.zip to ${cacheFolder}`);
       assert(fs.existsSync(`${path.join(cacheFolder, cacheKey)}.zip`), 'cache zip exists inside cache folder');
@@ -101,7 +101,7 @@ export class Caching {
         await extract(`${cacheSelection}.zip`, { dir: `${destinationFolder}` });
         process.chdir(path.basename(destinationFolder));
         await CloudRunnerSystem.Run(
-          `mv "${path.basename(destinationFolder)}/*" "${path.resolve(`${destinationFolder}/..`)}"`,
+          `mv "${path.basename(destinationFolder)}/*" "${path.resolve(`..`, `${destinationFolder}/`)}"`,
         );
       } else {
         RemoteClientLogger.logWarning(`cache item ${cacheKey} doesn't exist ${destinationFolder}`);

src/model/cli/remote-client/setup-cloud-runner-repository.ts

@@ -63,7 +63,8 @@ export class SetupCloudRunnerRepository {
       await CloudRunnerSystem.Run(`git lfs install --skip-smudge`);
       await CloudRunnerSystem.Run(
         `git clone ${CloudRunnerState.targetBuildRepoUrl} ${path.resolve(
-          `./../${path.basename(CloudRunnerState.repoPathFull)}`,
+          `..`,
+          path.basename(CloudRunnerState.repoPathFull),
         )}`,
       );
       assert(fs.existsSync(`.git`));