diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7ac6c37..1a0170d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,21 +12,21 @@ jobs: strategy: matrix: os: [ubuntu] # centos + + steps: + - name: Check out the repository + uses: actions/checkout@v3 - steps: - steps: - - name: Check out the repository - uses: actions/checkout@v3 + - name: Set up Docker + uses: docker/setup-buildx-action@v2 - - name: Set up Docker - uses: docker/setup-buildx-action@v2 - - - 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 +<<<<<<< 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: | @@ -46,7 +46,30 @@ jobs: 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)