Macos speed test + docker update

aws · Oct 23, 2023 · e5ed07a · e5ed07a
1 parent 0a6f802
commit e5ed07a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -161,7 +161,7 @@ jobs:
           run: aws s3 cp s3://${{ secrets.S3_INTEGRATION_BUCKET }}/${{inputs.BucketKey}}/ . --recursive
         - name: Sign Build Files
           if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false
-          run: for f in $(.); do if [ ! -d $f ]; then echo "Signing file $f" && gpg --detach-sign $f ; fi ; done
+          run: for f in $(ls); do if [ ! -d $f ]; then echo "Signing file $f" && gpg --detach-sign $f ; fi ; done
         - name: Build Cloudwatch Agent Image
           uses: docker/build-push-action@v4
           if: contains(inputs.BucketKey, 'test') == false || steps.cached_binaries.outputs.cache-hit == false

diff --git a/packaging/uniformBuild/remoteBuilder/remoteBuildManager.go b/packaging/uniformBuild/remoteBuilder/remoteBuildManager.go
@@ -122,7 +122,7 @@ func (rbm *RemoteBuildManager) MakeMacPkg(instanceName string, commitHash string
 		commands.CloneGitRepo(common.MAIN_REPO, "main"),
 		"cd ccwa",
 		commands.MakeMacBinary(),
-		commands.CopyBinaryMac(),
+		//commands.CopyBinaryMac(),
 		commands.CreatePkgCopyDeps(),
 		commands.BuildAndUploadMac(commitHash),
 	)

diff --git a/packaging/uniformBuild/uniformBuilder.go b/packaging/uniformBuild/uniformBuilder.go
@@ -34,6 +34,9 @@ func main() {
 	var err error
 	eg := new(errgroup.Group)
 	defer rbm.Close()
+	eg.Go(func() error {
+		return rbm.MakeMacPkg("MacPkgMaker", packageBucketKey)
+	})
 	err = rbm.BuildCWAAgent(repo, branch, bucketKey, "MainBuildEnv")
 	if err != nil {
 		panic(err)
@@ -49,13 +52,7 @@ func main() {
 		}
 		return nil
 	})
-	eg.Go(func() error {
-		err = rbm.MakeMacPkg("MacPkgMaker", packageBucketKey)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
+
 	if err := eg.Wait(); err != nil {
 		fmt.Printf("Failed because: %s \n", err)
 		return