restore previous flux clone prepare for merge

Signed-off-by: vsoch <[email protected]>
flux-framework · Feb 14, 2025 · 21a0b03 · 21a0b03
1 parent 2ad8d8c
commit 21a0b03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -19,7 +19,7 @@ RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz  && tar -xvf go${G
          mv go /usr/local && rm go${GO_VERSION}.linux-amd64.tar.gz
 ENV PATH=$PATH:/usr/local/go/bin:/home/vscode/go/bin
 
-RUN git clone -b grow-api https://github.com/milroy/flux-sched /opt/flux-sched
+RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
 
 # Add the group and user that match our ids
 RUN groupadd -g ${USER_GID} ${USERNAME} && \

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -24,7 +24,7 @@ jobs:
         test: [["fluxrm/flux-sched:noble", "/usr/lib"],
                ["fluxrm/flux-sched:fedora40", "/usr/lib64"],
                ["fluxrm/flux-sched:bookworm-amd64", "/usr/lib"]]
-#               ["fluxrm/flux-sched:el9", "/usr/lib64"]]
+               ["fluxrm/flux-sched:el9", "/usr/lib64"]]
 
     container:
       image: ${{ matrix.test[0] }}
@@ -37,12 +37,12 @@ jobs:
         go-version: ^1.22
 
     - name: flux-sched build
-      run: git clone -b grow-api-rebase https://github.com/researchapps/flux-sched /opt/flux-sched
-    - name: build flux-sched
-      run: |
-        here=$(pwd)
-        cd /opt/flux-sched
-        mkdir build && cd build && cmake ../ && make -j && sudo make install
-        cd $here
+      run: git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
+#    - name: build flux-sched
+#      run: |
+#        here=$(pwd)
+#        cd /opt/flux-sched
+#        mkdir build && cd build && cmake ../ && make -j && sudo make install
+#        cd $here
     - name: Test
       run: LIB_PREFIX=${{ matrix.test[1] }} make test-v
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz  && tar -xvf go${G
          mv go /usr/local && rm go${GO_VERSION}.linux-amd64.tar.gz
 ENV PATH=$PATH:/usr/local/go/bin:/home/vscode/go/bin
 
-RUN git clone -b grow-api https://github.com/milroy/flux-sched /opt/flux-sched
+RUN git clone https://github.com/flux-framework/flux-sched /opt/flux-sched
 RUN cd /opt/flux-sched && \
     export FLUX_SCHED_VERSION=0.40.0 && \
     mkdir build && cd build && cmake ../ && make -j && sudo make install