From 4fb65084a83390fa762e3ee4dc8cf5e632d9b3d7 Mon Sep 17 00:00:00 2001 From: HieuBui Date: Fri, 15 Mar 2024 10:08:29 +0700 Subject: [PATCH 1/4] update docker to 8.6.9 --- .github/workflows/workflow.yml | 4 ++-- src/scripts/setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7ac6fa3b..f3679ed5 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -8,8 +8,8 @@ jobs: 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 diff --git a/src/scripts/setup.sh b/src/scripts/setup.sh index 63a78034..17ad2d3e 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 From 12bc6fb983a2d153afa50bf2716cfbcae3ecc788 Mon Sep 17 00:00:00 2001 From: Nghia Dang Date: Thu, 28 Mar 2024 15:53:58 +0700 Subject: [PATCH 2/4] Change branch to release-8.6.9 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f3679ed5..57660394 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -2,7 +2,7 @@ name: KatalonDockerCI on: push: branches: - - master + - release-8.6.9 jobs: run: name: Run From f646bd54b4aa8ee081eadda7eafad12548bf31aa Mon Sep 17 00:00:00 2001 From: Nghia Dang Date: Thu, 23 May 2024 19:32:17 +0700 Subject: [PATCH 3/4] re-symlink google-chrome --- .github/workflows/workflow.yml | 5 +---- src/scripts/setup.sh | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 57660394..53124035 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,13 +21,12 @@ jobs: - name: Prepare run: | chmod u+x ./build/*.sh - ./build/prevent_overwrite_existing_tag.sh $KS_VERSION + ./build/prevent_overwrite_existing_tag.sh $KS_VERSION_TAG - 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 +44,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 17ad2d3e..10a55a37 100755 --- a/src/scripts/setup.sh +++ b/src/scripts/setup.sh @@ -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 From a9b3d1f6c158d0333fcb2ed6089b7098d6e0afef Mon Sep 17 00:00:00 2001 From: Vu Than Date: Mon, 27 May 2024 16:17:59 +0700 Subject: [PATCH 4/4] Release 8.6.9 --- .github/workflows/workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 53124035..608ba4b5 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -21,7 +21,6 @@ jobs: - name: Prepare run: | chmod u+x ./build/*.sh - ./build/prevent_overwrite_existing_tag.sh $KS_VERSION_TAG - name: Build run: | chmod u+x ./build/*.sh