Merge pull request #2239 from openziti/release-next

Merge to main for v1.1.7 release
openziti · Jul 16, 2024 · 94013fe · 94013fe
2 parents 1144159 + fbc8b50
commit 94013fe
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -392,15 +392,17 @@ jobs:
 
   publish:
     name: Publish Binaries
-    # - !cancelled() allows evaluating further conditional expressions even if
-    #   needed jobs were skipped
+    # - !cancelled() allows evaluating further conditional expressions even if needed jobs were skipped; this unblocks
+    # the job allowing it to run even if needed jobs failed, unless explicitly required in the "if" expression
     if: ${{
       !cancelled()
       && (needs.mac-os-build.result == 'success' || needs.mac-os-build.result == 'skipped')
       && (needs.windows-build.result == 'success' || needs.windows-build.result == 'skipped')
       && (needs.fablab-smoketest.result == 'success' || needs.fablab-smoketest.result == 'skipped')
+      && (needs.tests.result == 'success')
       }}
     runs-on: ubuntu-20.04
+    # ensure required job outcomes are specified in "if" expression
     needs: [ tests, linux-build, mac-os-build, windows-build, fablab-smoketest, fablab-ha-smoketest ]
     outputs:
       ZITI_VERSION: ${{ steps.get_version.outputs.ZITI_VERSION }}

diff --git a/.github/workflows/promote-downstreams.yml b/.github/workflows/promote-downstreams.yml
@@ -32,6 +32,7 @@ jobs:
           wait-interval: 20
           # confusingly, this means "pause this step until all jobs from all workflows in same run have completed"
           running-workflow-name: Wait for Release Builds to Succeed
+          ignore-checks: SDK Terminator Validation  # comma-separated list of check names (job.<id>.name) to ignore
 
   parse_version:
     needs: wait_for_release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -147,11 +147,16 @@ jobs:
 
   publish:
     name: Publish Binaries
+    # !cancelled() overrides default behavior, allowing this job to proceed if needed jobs failed, unless "if"
+    # expression specifies a required outcome
     if: ${{
       !cancelled()
       && (needs.mac-os-build.result == 'success' || needs.mac-os-build.result == 'skipped')
       && (needs.windows-build.result == 'success' || needs.windows-build.result == 'skipped')
+      && (needs.linux-build.result == 'success')
+      && (needs.tests.result == 'success')
       }}
+    # ensure required job outcomes are specified in "if" expression
     needs: [ tests, linux-build, mac-os-build, windows-build ]
     runs-on: ubuntu-20.04
     outputs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Release 1.1.7
+
+## What's New
+
+* Release actions fixes
+* Fix for a flaky acceptance test
+
 # Release 1.1.6
 
 ## What's New

diff --git a/tests/authenticate.go b/tests/authenticate.go
@@ -922,8 +922,15 @@ func (request *authenticatedRequests) requireServiceUpdateTimeUnchanged() {
 }
 
 func (request *authenticatedRequests) requireServiceUpdateTimeAdvanced() {
-	time.Sleep(5 * time.Millisecond)
-	lastUpdated := request.getServiceUpdateTime()
+	start := time.Now()
+	var lastUpdated time.Time
+	for time.Since(start) < time.Minute {
+		time.Sleep(5 * time.Millisecond)
+		lastUpdated = request.getServiceUpdateTime()
+		if request.session.lastServiceUpdate.Before(lastUpdated) {
+			break
+		}
+	}
 	request.testContext.Req.True(request.session.lastServiceUpdate.Before(lastUpdated))
 	request.session.lastServiceUpdate = lastUpdated
 	time.Sleep(5 * time.Millisecond)