emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/request fe567ec022 6/6: timing of implicit github merge co


From: ELPA Syncer
Subject: [nongnu] elpa/request fe567ec022 6/6: timing of implicit github merge commit confounds.
Date: Tue, 15 Nov 2022 12:02:27 -0500 (EST)

branch: elpa/request
commit fe567ec0222a1ba658866697a9e7fb6b63d71ff7
Author: dickmao <none>
Commit: dickmao <none>

    timing of implicit github merge commit confounds.
    
    my younger self is my strongest opponent.
---
 .github/workflows/test.yml |  6 +++---
 Makefile                   | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dbb79ab483..16b5f7cf4a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,11 +17,11 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        emacs_version: [26.3]
-        python_version: [2.7]
+        emacs_version: [25.3, 26.3, 27.2, 28.2]
+        python_version: [2.7, 3.6]
 
     steps:
     - uses: actions/checkout@v1
diff --git a/Makefile b/Makefile
index 96dc90710d..f039609611 100644
--- a/Makefile
+++ b/Makefile
@@ -102,16 +102,17 @@ endef
 .PHONY: test-install-vars
 test-install-vars:
        $(eval $(call SET_GITHUB_ACTOR))
-       $(info ${GITHUB_ACTOR})
        $(eval $(call SET_GITHUB_ACTOR_REPOSITORY))
-       $(info ${GITHUB_ACTOR_REPOSITORY})
        $(eval $(call SET_GITHUB_HEAD_REF))
-       $(info ${GITHUB_HEAD_REF})
        $(eval $(call SET_GITHUB_SHA))
        $(eval $(call SET_GITHUB_COMMIT))
-       git show -s --format=%s $(GITHUB_COMMIT) || true
-       git show -s --format=%s $(GITHUB_SHA) || true
+       git show -s --format=%s $(GITHUB_COMMIT)
+       # this needs to be the github implicit merge commit
+       # e.g., "Merge 8feb544 into 2c33e45",
+       git show -s --format=%s $(GITHUB_SHA)
 
+# The timing of the github implicit merge commit for PRs
+# is elusive.  So the following won't halt CI.
 .PHONY: test-install
 test-install: test-install-vars
        mkdir -p tests/test-install
@@ -138,4 +139,4 @@ test-install: test-install-vars
                   (oset rcp :branch my-branch) \
                   (oset rcp :commit my-commit))" \
        --eval "(package-build--package rcp (package-build--checkout rcp))" \
-       --eval "(package-install-file (car (file-expand-wildcards (concat 
package-build-archive-dir \"request*.el\"))))" 2>&1 | egrep -ia "error: |fatal" 
)
+       --eval "(package-install-file (car (file-expand-wildcards (concat 
package-build-archive-dir \"request*.el\"))))" 2>&1 | egrep -ia "error: |fatal" 
&& false)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]