Skip to content

Commit

Permalink
Merge pull request #145 from katalon-studio/master
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
quidl authored Oct 2, 2023
2 parents 2d0c2e0 + 4a26b5f commit ba0d934
Show file tree
Hide file tree
Showing 27 changed files with 3,722 additions and 2,016 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/package_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- macos-latest
- windows-latest
node-version:
- 10.x
- 14.x

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- macos-latest
- windows-latest
node-version:
- 10.x
- 14.x

steps:
- name: Checkout code
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Test

on:
pull_request:
push:
branches:
- master
- release

concurrency:
group: test-${{ github.head_ref || github.sha }}
cancel-in-progress: true

jobs:

build:

runs-on: ubuntu-latest
steps:

- name: Checkout Katalon Agent
uses: actions/checkout@v3

- name: Set up Nodejs 14
uses: actions/setup-node@v3
with:
node-version: '14'
cache: 'npm'
cache-dependency-path: package-lock.json

- name: Run test
run: |
npm ci
npm run eslint
npm run test:coverage || true
npm run buildLinux --if-present
sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage/lcov.info
- name: Sonar Cloud Scan
uses: SonarSource/[email protected]
with:
args: >
-Dsonar.verbose=true
-X
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: Run ESLint check
uses: sibiraj-s/action-eslint@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
eslint-args: '-c .eslintrc.yml'
extensions: 'js'
annotations: true
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ typings/
# Temp
tmp
proc

test/*
!test/core/

.idea
*.iml
test/core/api/debug.log

reports
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v14.17.0
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build agent
FROM node:10 as build
FROM node:14 as build

ARG KATALON_ROOT_DIR=/katalon
RUN mkdir -p $KATALON_ROOT_DIR
Expand All @@ -10,7 +10,7 @@ RUN chmod a+x ./docker/scripts/build_agent.sh
RUN ./docker/scripts/build_agent.sh

# Build docker image
FROM katalonstudio/katalon:8.6.5
FROM katalonstudio/katalon:8.6.8

# Agent arguement
ARG AGENT_VERSION
Expand Down Expand Up @@ -60,7 +60,7 @@ COPY --from=build /katalon/bin/cli-linux-x64 *.sh ./

# Copy script files and setup
WORKDIR $KATALON_SCRIPT_DIR
# COPY ./docker/scripts/wrap_chrome_binary.sh wrap_chrome_binary.sh
COPY ./docker/scripts/wrap_chrome_binary.sh wrap_chrome_binary.sh
# COPY ./docker/scripts/setup_environment.sh setup_environment.sh
COPY ./docker/scripts/upgrade_environment.sh upgrade_environment.sh
COPY ./docker/scripts/setup_agent.sh setup_agent.sh
Expand Down
3 changes: 2 additions & 1 deletion docker/scripts/upgrade_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ 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
echo "$(google-chrome --version)" >> $KATALON_VERSION_FILE || true
./wrap_chrome_binary.sh
echo "$(google-chrome --version)" >> $KATALON_VERSION_FILE || true
Loading

0 comments on commit ba0d934

Please sign in to comment.