diff --git a/.circleci/config.yml b/.circleci/config.yml index b1e61a73..ec3bc5b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,10 +27,6 @@ aliases: echo 'export CIRCLE_SHA1="$CIRCLE_SHA1"' >> $BASH_ENV echo 'export CIRCLE_PROJECT_REPONAME="$CIRCLE_PROJECT_REPONAME"' >> $BASH_ENV .circleci/trigger_build_v2.sh "entur/lamassu-deployment-config.git" "master" "$(git log -1 --pretty=%B)" - - &docker-build - name: Docker build - command: | - DOCKER_BUILDKIT=1 docker build . jobs: test: @@ -108,17 +104,6 @@ jobs: # Cannot use -o because of snapshot dependencies. - run: mvn deploy -s .circleci/settings.xml -P prettierSkip -DskipTests - run: *post_build - docker-build: - docker: - - image: cimg/openjdk:17.0.8 - auth: - username: $DOCKERHUB_LOGIN - password: $DOCKERHUB_PASSWORD - steps: - - setup_remote_docker: - version: 20.10.24 - - checkout - - run: *docker-build workflows: version: 2.1 @@ -136,6 +121,3 @@ workflows: - master requires: - test-release - - docker-build: - name: docker-build - context: global \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..2b25f227 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,53 @@ +name: CI Build + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + tests: + runs-on: ubuntu-latest + env: + TZ: Europe/Oslo + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + + - name: Run tests + run: | + sudo timedatectl set-timezone "Europe/Oslo" + mvn --batch-mode test + + image: + # only build and push the image when it's a commit to master in Entur's repository + if: github.repository_owner == 'entur' && github.event_name == 'push' + runs-on: ubuntu-latest + needs: [ tests ] + env: + CONTAINER_REPO: docker.io/entur/lamassu + CONTAINER_REGISTRY_USER: ${{ secrets.DOCKERHUB_LOGIN }} + CONTAINER_REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + steps: + - uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + + - name: Build container image with Jib, push to Github Container Repo + run: | + image_date=`date +%Y-%m-%dT%H-%M` + mvn --batch-mode compile com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_date \ No newline at end of file