diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index f7b0fdf..01b9360 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -18,7 +18,7 @@ blocks: prologue: commands: - - sem-version go 1.24.11 + - sem-version go 1.24.12 - checkout jobs: @@ -37,7 +37,7 @@ blocks: - checkout - mv ~/.ssh/security-toolbox ~/.ssh/id_rsa - sudo chmod 600 ~/.ssh/id_rsa - - sem-version go 1.24.11 + - sem-version go 1.24.12 jobs: - name: Check dependencies commands: @@ -63,7 +63,7 @@ blocks: prologue: commands: - - sem-version go 1.24.11 + - sem-version go 1.24.12 - checkout - go version - go get @@ -96,7 +96,7 @@ blocks: prologue: commands: - - sem-version go 1.24.11 + - sem-version go 1.24.12 - checkout - go version - go get @@ -163,7 +163,7 @@ blocks: prologue: commands: - - sem-version go 1.24.11 + - sem-version go 1.24.12 - checkout - go version - go get @@ -200,7 +200,7 @@ blocks: prologue: commands: - - sem-version go 1.24.11 + - sem-version go 1.24.12 - checkout - go version - go get @@ -241,7 +241,7 @@ blocks: prologue: commands: - - sem-version go 1.24.11 + - sem-version go 1.24.12 - curl -sLO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 && install minikube-linux-amd64 /tmp/ - /tmp/minikube-linux-amd64 config set WantUpdateNotification false - /tmp/minikube-linux-amd64 start --driver=docker diff --git a/pkg/jobs/job.go b/pkg/jobs/job.go index 2ceb982..1561bb0 100644 --- a/pkg/jobs/job.go +++ b/pkg/jobs/job.go @@ -686,7 +686,12 @@ func (job *Job) uploadLogsAsArtifact(trimmed bool) { return } - args := []string{"push", "job", file, "-d", "agent/job_logs.txt"} + artifactPath := "agent/job_logs.txt" + if strings.HasSuffix(file, ".gz") { + artifactPath = artifactPath + ".gz" + } + + args := []string{"push", "job", file, "-d", artifactPath} // #nosec cmd := exec.Command(path, args...) diff --git a/test/e2e.rb b/test/e2e.rb index bb13c42..d25396e 100644 --- a/test/e2e.rb +++ b/test/e2e.rb @@ -92,9 +92,9 @@ def assert_artifact_is_compressed # to realize the "archivator" has reached out for the logs, and can close the logger. Timeout.timeout(20) do loop do - `artifact pull job agent/job_logs.txt -f -d job_logs.gz && (gunzip -c job_logs.gz | tail -n1 | grep -q "Exporting SEMAPHORE_JOB_RESULT")` + `artifact pull job agent/job_logs.txt.gz -f -d job_logs.gz && (gunzip -c job_logs.gz | tail -n1 | grep -q "Exporting SEMAPHORE_JOB_RESULT")` if $?.exitstatus == 0 - puts "sucess: agent/job_logs.txt exists and is compressed!" + puts "sucess: agent/job_logs.txt.gz exists and is compressed!" break else print "."