Update ci.yml

criteo · Nov 14, 2024 · 398e5d5 · 398e5d5
1 parent 4d688c4
commit 398e5d5
Showing 1 changed file with 20 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,56 +20,30 @@ jobs:
         - name: Set up Docker
           uses: docker/setup-buildx-action@v2
 
-<<<<<<< HEAD
-      - name: Install Docker Compose
-        run: |
-          DOCKER_COMPOSE_VERSION="2.11.2"
-          sudo curl -L "https://github.com/docker/compose/releases/download/v$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
-
-      - name: Install project
-        run: |
-          ./.ci/install.sh && \
-          make gen-conf OS_CONTAINER=${{ matrix.os }} && \
-          make install OS_CONTAINER=${{ matrix.os }}
-
-      - name: Check version
-        run: .ci/check-version.sh
-
-      - name: Test
-        run: make test
-
-      - name: Finish
-        run: |
-          cat /tmp/krb5-test-${{ matrix.os }}.log && \
-          ls -lR && \
-          ./script/inspect.sh && \
-          ./.ci/check-version.sh
-=======
         - name: Install Docker Compose
           run: |
             DOCKER_COMPOSE_VERSION="2.11.2"
             sudo curl -L "https://github.com/docker/compose/releases/download/v$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
             sudo chmod +x /usr/local/bin/docker-compose
             docker-compose --version
 
-          - name: Install project
-            run: |
-              ./.ci/install.sh && \
-              make gen-conf OS_CONTAINER=${{ matrix.os }} && \
-              make install OS_CONTAINER=${{ matrix.os }}
-
-          - name: Check version
-            run: .ci/check-version.sh
-
-          - name: Test
-            run: make test
-
-          - name: Finish
-            run: |
-              cat /tmp/krb5-test-${{ matrix.os }}.log && \
-              ls -lR && \
-              ./script/inspect.sh && \
-              ./.ci/check-version.sh
->>>>>>> 0304859 (Fix GitHub action to install docker-compose)
+        - name: Install project
+          run: |
+            ./.ci/install.sh && \
+            make gen-conf OS_CONTAINER=${{ matrix.os }} && \
+            make install OS_CONTAINER=${{ matrix.os }}
+  
+        - name: Check version
+          run: .ci/check-version.sh
+
+        - name: Test
+          run: make test
+
+        - name: Finish
+          run: |
+            cat /tmp/krb5-test-${{ matrix.os }}.log && \
+            ls -lR && \
+            ./script/inspect.sh && \
+            ./.ci/check-version.sh
+                ./.ci/check-version.sh
+  >>>>>>> 0304859 (Fix GitHub action to install docker-compose)