diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7ac6fa3b..608ba4b5 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -2,14 +2,14 @@ name: KatalonDockerCI on: push: branches: - - master + - release-8.6.9 jobs: run: name: Run runs-on: ubuntu-latest env: - KS_VERSION: 9.3.1 - KS_VERSION_TAG: 9.3.1 + KS_VERSION: 8.6.9 + KS_VERSION_TAG: latest steps: - name: Checkout uses: actions/checkout@master @@ -21,13 +21,11 @@ jobs: - name: Prepare run: | chmod u+x ./build/*.sh - ./build/prevent_overwrite_existing_tag.sh $KS_VERSION - name: Build run: | chmod u+x ./build/*.sh ./build/clean.sh $KS_VERSION ./build/build.sh $KS_VERSION - ./build/tag.sh $KS_VERSION - name: Test run: | chmod u+x ./test/project/*.sh @@ -45,8 +43,6 @@ jobs: run: | cd $GITHUB_WORKSPACE docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} docker.io - ./build/tag.sh $KS_VERSION - ./build/push.sh $KS_VERSION ./build/tag.sh $KS_VERSION_TAG ./build/push.sh $KS_VERSION_TAG - name: Slack Notification diff --git a/src/scripts/setup.sh b/src/scripts/setup.sh index 63a78034..10a55a37 100755 --- a/src/scripts/setup.sh +++ b/src/scripts/setup.sh @@ -16,7 +16,7 @@ apt -y install gosu apt -y install psmisc echo "Install JRE" -apt -y install openjdk-17-jdk +apt -y install openjdk-8-jdk echo "Install CircleCI tools" apt -y install git @@ -50,6 +50,13 @@ chrome_package='google-chrome-stable_current_amd64.deb' wget -O $chrome_package https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb dpkg -i $chrome_package || apt -y -f install rm $chrome_package + +symlink="/usr/bin/google-chrome" +if [ -L $symlink ]; then + unlink $symlink + ln -s /opt/google/chrome/google-chrome $symlink +fi + echo "$(google-chrome --version)" >> $KATALON_VERSION_FILE || true ./wrap_chrome_binary.sh && rm -rfv ./wrap_chrome_binary.sh