From ce942092bba66883047b11732220b2062088d842 Mon Sep 17 00:00:00 2001 From: David Ozog Date: Thu, 16 Nov 2023 15:11:35 -0500 Subject: [PATCH 1/5] CI: move "submodules: true" to the top of each job --- .github/workflows/ci.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a719f926..99962907 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,6 +152,8 @@ jobs: run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + submodules: 'true' - name: Install dependencies run: | sudo apt-get install -y gfortran rpm mpich libmpich-dev libhwloc-dev @@ -210,9 +212,6 @@ jobs: sudo chown `whoami` /dev/xpmem # SOS - - uses: actions/checkout@v2 - with: - submodules: 'true' - name: Build SOS (${{ matrix.sos_config }}) run: | ./autogen.sh @@ -487,6 +486,8 @@ jobs: run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + submodules: 'true' - name: Install dependencies run: | sudo apt-get install -y gfortran mpich libmpich-dev @@ -536,9 +537,6 @@ jobs: make install # SOS - - uses: actions/checkout@v2 - with: - submodules: 'true' - name: Build SOS (${{ matrix.sos_config }}) run: | ./autogen.sh @@ -580,6 +578,8 @@ jobs: run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + submodules: 'true' - name: Install dependencies run: | sudo apt-get install -y gfortran mpich libmpich-dev libev-dev libev-libevent-dev @@ -629,9 +629,6 @@ jobs: make install # SOS - - uses: actions/checkout@v2 - with: - submodules: 'true' - name: Build SOS (${{ matrix.name }}) run: | ./autogen.sh @@ -660,6 +657,8 @@ jobs: run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - uses: actions/checkout@v2 + with: + submodules: 'true' - name: Install dependencies run: | sudo apt-get install -y gfortran mpich libmpich-dev libev-dev libev-libevent-dev @@ -685,9 +684,6 @@ jobs: sudo chown `whoami` /dev/xpmem # SOS - - uses: actions/checkout@v2 - with: - submodules: 'true' - name: Build SOS (${{ matrix.name }}) run: | ./autogen.sh From e081eeb0418edc976d2a684ca1eff855a1c39cd0 Mon Sep 17 00:00:00 2001 From: kholland Date: Thu, 16 Nov 2023 15:47:54 -0600 Subject: [PATCH 2/5] Update Error message in autogen Also, updated the github actions/checkout version to v4 --- .github/workflows/ci.yml | 22 +++++++++++----------- autogen.sh | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99962907..7b7336bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,7 @@ jobs: - name: Checking OS version run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: 'true' - name: Install dependencies @@ -169,7 +169,7 @@ jobs: key: libfabric-${{ matrix.libfabric_version }}-${{ env.OS_NAME }} - name: Checkout libfabric if: steps.cache-libfabric.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: ofiwg/libfabric path: repos/libfabric @@ -194,7 +194,7 @@ jobs: key: xpmem-${{ matrix.xpmem_version }}-${{ env.OS_NAME }} - name: Checkout XPMEM if: ${{ matrix.xpmem_version }} - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: hjelmn/xpmem path: repos/xpmem @@ -485,7 +485,7 @@ jobs: - name: Checking OS version run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: 'true' - name: Install dependencies @@ -496,7 +496,7 @@ jobs: # XPMEM - name: Checkout XPMEM - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: hjelmn/xpmem path: repos/xpmem @@ -521,7 +521,7 @@ jobs: key: ucx-${{ matrix.ucx_version}}-${{ env.OS_NAME }} - name: Checkout UCX if: steps.cache-ucx.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: openucx/ucx path: repos/ucx @@ -577,7 +577,7 @@ jobs: - name: Checking OS version run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: 'true' - name: Install dependencies @@ -588,7 +588,7 @@ jobs: # XPMEM - name: Checkout XPMEM - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: hjelmn/xpmem path: repos/xpmem @@ -613,7 +613,7 @@ jobs: key: portals4-${{ matrix.portals4_version}}-${{ env.OS_NAME }} - name: Checkout Portals4 if: steps.cache-portals4.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: regrant/portals4 path: repos/portals4 @@ -656,7 +656,7 @@ jobs: - name: Checking OS version run: | echo "OS_NAME=$(lsb_release -si)-$(ls_release -sr)" >> $GITHUB_ENV - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: 'true' - name: Install dependencies @@ -667,7 +667,7 @@ jobs: # XPMEM - name: Checkout XPMEM - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: hjelmn/xpmem path: repos/xpmem diff --git a/autogen.sh b/autogen.sh index 2aec3ee8..f4106d09 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ test -d ./config || mkdir ./config -test -f modules/test-sos/configure.ac || { echo -n "WARNING: The test directory is empty. Please run the following command to install the SOS tests:\ngit submodule update --init"; } +test -f modules/test-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to install the SOS tests:"; echo "git submodule update --init"; exit 1; } FILES=./man/*.1 echo -n "dist_man1_MANS =" > ./man/Makefile.am From a2643b78756a987ba889c55fb5f3fdd685b28740 Mon Sep 17 00:00:00 2001 From: kholland Date: Fri, 17 Nov 2023 16:18:00 -0600 Subject: [PATCH 3/5] Re-add tests-sos submodule to track main branch --- .gitmodules | 4 ++-- autogen.sh | 2 +- modules/test-sos | 1 - modules/tests-sos | 1 + test | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 160000 modules/test-sos create mode 160000 modules/tests-sos diff --git a/.gitmodules b/.gitmodules index 86947c08..5a48f430 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "modules/test-sos"] - path = modules/test-sos +[submodule "modules/tests-sos"] + path = modules/tests-sos url = git@github.com:openshmem-org/tests-sos.git diff --git a/autogen.sh b/autogen.sh index f4106d09..e05079b1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ test -d ./config || mkdir ./config -test -f modules/test-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to install the SOS tests:"; echo "git submodule update --init"; exit 1; } +test -f modules/tests-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to install the SOS tests:"; echo "git submodule update --init"; exit 1; } FILES=./man/*.1 echo -n "dist_man1_MANS =" > ./man/Makefile.am diff --git a/modules/test-sos b/modules/test-sos deleted file mode 160000 index 5f7905fb..00000000 --- a/modules/test-sos +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f7905fb5bc5bb3d51ffafe39b5602eb7b4f452c diff --git a/modules/tests-sos b/modules/tests-sos new file mode 160000 index 00000000..d52b3fbd --- /dev/null +++ b/modules/tests-sos @@ -0,0 +1 @@ +Subproject commit d52b3fbd51675ff98dd9b15d9b104a85d9e5e604 diff --git a/test b/test index 206ef703..4a6278b6 120000 --- a/test +++ b/test @@ -1 +1 @@ -modules/test-sos/test/ \ No newline at end of file +modules/tests-sos/test/ \ No newline at end of file From c09cb26478fc66af153e518fd2b84056dff8244d Mon Sep 17 00:00:00 2001 From: kholland Date: Mon, 20 Nov 2023 15:31:19 -0600 Subject: [PATCH 4/5] Removed submodule --- .gitmodules | 3 --- modules/tests-sos | 1 - 2 files changed, 4 deletions(-) delete mode 160000 modules/tests-sos diff --git a/.gitmodules b/.gitmodules index 5a48f430..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "modules/tests-sos"] - path = modules/tests-sos - url = git@github.com:openshmem-org/tests-sos.git diff --git a/modules/tests-sos b/modules/tests-sos deleted file mode 160000 index d52b3fbd..00000000 --- a/modules/tests-sos +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d52b3fbd51675ff98dd9b15d9b104a85d9e5e604 From e938972e59471955ddf801e752ef5d43eed24217 Mon Sep 17 00:00:00 2001 From: kholland Date: Mon, 20 Nov 2023 15:54:04 -0600 Subject: [PATCH 5/5] Correctly tracking branch in submodule --- .gitmodules | 4 ++++ autogen.sh | 2 +- modules/tests-sos | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 modules/tests-sos diff --git a/.gitmodules b/.gitmodules index e69de29b..9e3dc2f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "modules/tests-sos"] + path = modules/tests-sos + url = git@github.com:openshmem-org/tests-sos.git + branch = main diff --git a/autogen.sh b/autogen.sh index e05079b1..699a6845 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ test -d ./config || mkdir ./config -test -f modules/tests-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to install the SOS tests:"; echo "git submodule update --init"; exit 1; } +test -f modules/tests-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to download the SOS tests:"; echo "git submodule update --init"; exit 1; } FILES=./man/*.1 echo -n "dist_man1_MANS =" > ./man/Makefile.am diff --git a/modules/tests-sos b/modules/tests-sos new file mode 160000 index 00000000..d52b3fbd --- /dev/null +++ b/modules/tests-sos @@ -0,0 +1 @@ +Subproject commit d52b3fbd51675ff98dd9b15d9b104a85d9e5e604