Skip to content

Commit e2fabe8

Browse files
Harshg999Harshg999
authored
Merge branch 'master' into oidc_fix
2 parents 75118c9 + 9aa033a commit e2fabe8

File tree

152 files changed

+1766
-3534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+1766
-3534
lines changed

‎.github/workflows/arm64-python-ci.yml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Python 3 ARM64 CI
33
on:
44
push:
55
branches:
6-
- master
6+
- master
77
pull_request:
88
branches:
9-
- master
9+
- master
1010

1111
jobs:
1212
hue-build-and-tests-arm64:
@@ -15,68 +15,68 @@ jobs:
1515
runs-on: ubuntu-22.04-arm
1616

1717
steps:
18-
- name: Checkout
19-
uses: actions/checkout@v4
20-
with:
21-
fetch-depth: 0
22-
23-
- name: Check commit title format
24-
run: |
25-
./tools/ci/check_for_commit_message.sh
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
2622

27-
- name: Set up Python 3.11
28-
uses: actions/setup-python@v5
29-
with:
30-
python-version: '3.11'
23+
- name: Check commit title format
24+
run: |
25+
./tools/ci/check_for_commit_message.sh
3126
32-
- name: Cache pip
33-
uses: actions/cache@v4
34-
with:
35-
path: ~/.cache/pip
36-
key: ${{ runner.os }}-arm64-py311-pip-${{ hashFiles('desktop/core/generate_requirements.py') }}
37-
restore-keys: |
38-
${{ runner.os }}-arm64-py311-pip-
39-
${{ runner.os }}-arm64-py311-
40-
${{ runner.os }}-arm64-
27+
- name: Set up Python 3.11
28+
uses: actions/setup-python@v5
29+
with:
30+
python-version: '3.11'
4131

42-
- name: Setup node 20 and cache npm
43-
uses: actions/setup-node@v4
44-
with:
45-
node-version: 20
46-
cache: 'npm'
32+
- name: Cache pip
33+
uses: actions/cache@v4
34+
with:
35+
path: ~/.cache/pip
36+
key: ${{ runner.os }}-arm64-py311-pip-${{ hashFiles('desktop/core/generate_requirements.py') }}
37+
restore-keys: |
38+
${{ runner.os }}-arm64-py311-pip-
39+
${{ runner.os }}-arm64-py311-
40+
${{ runner.os }}-arm64-
4741
48-
- name: Build Hue
49-
run: |
50-
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
51-
export DEBIAN_FRONTEND=noninteractive
52-
sudo apt-get update -y
53-
sudo apt-get install -y build-essential asciidoc libkrb5-dev libldap2-dev libsasl2-dev libxml2-dev libxslt-dev libsasl2-modules-gssapi-mit libsnappy-dev libncursesw5-dev libgdbm-dev
54-
55-
# Install Python 3.11 using deadsnakes PPA
56-
sudo add-apt-repository -y ppa:deadsnakes/ppa
57-
sudo apt-get install -y python3.11 python3.11-dev python3.11-venv python3.11-distutils
58-
59-
# Install pip for Python 3.11
60-
curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python3.11
61-
62-
unset PIP_FIND_LINKS
63-
unset PIP_EXTRA_INDEX_URL
42+
- name: Setup node 20 and cache npm
43+
uses: actions/setup-node@v4
44+
with:
45+
node-version: 20
46+
cache: 'npm'
6447

65-
export PYTHON_VER=python3.11
66-
export SKIP_PYTHONDEV_CHECK=true
67-
export ROOT=$PWD
68-
make apps docs test_prep
48+
- name: Build Hue
49+
run: |
50+
sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
51+
export DEBIAN_FRONTEND=noninteractive
52+
sudo apt-get update -y
53+
sudo apt-get install -y build-essential asciidoc libkrb5-dev libldap2-dev libsasl2-dev libxml2-dev libxslt-dev libsasl2-modules-gssapi-mit libsnappy-dev libncursesw5-dev libgdbm-dev
6954
70-
- name: Run python lint check
71-
run: |
72-
PYTHONWARNINGS=always ./build/env/bin/hue runruff check
55+
# Install Python 3.11 using deadsnakes PPA
56+
sudo add-apt-repository -y ppa:deadsnakes/ppa
57+
sudo apt-get install -y python3.11 python3.11-dev python3.11-venv python3.11-distutils
7358
74-
- name: Run unit tests
75-
run: |
76-
PYTHONWARNINGS=always ./build/env/bin/pytest
59+
# Install pip for Python 3.11
60+
curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python3.11
7761
78-
- name: Upload reports
79-
uses: actions/upload-artifact@v4
80-
with:
81-
name: hue-reports-arm64
82-
path: ./reports
62+
unset PIP_FIND_LINKS
63+
unset PIP_EXTRA_INDEX_URL
64+
65+
export PYTHON_VER=python3.11
66+
export SKIP_PYTHONDEV_CHECK=true
67+
export ROOT=$PWD
68+
make apps docs test_prep
69+
70+
- name: Run python lint check
71+
run: |
72+
PYTHONWARNINGS=always ./build/env/bin/hue runruff check
73+
74+
- name: Run unit tests
75+
run: |
76+
PYTHONWARNINGS=always ./build/env/bin/pytest
77+
78+
- name: Upload reports
79+
uses: actions/upload-artifact@v4
80+
with:
81+
name: hue-reports-arm64
82+
path: ./reports

‎.github/workflows/cleanup-cache.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ jobs:
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v4
13-
13+
1414
- name: Cleanup
1515
run: |
1616
gh extension install actions/gh-actions-cache
17-
17+
1818
REPO=${{ github.repository }}
1919
BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
2020
2121
echo "Fetching list of cache key"
2222
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
2323
24-
## Setting this to not fail the workflow while deleting cache keys.
24+
## Setting this to not fail the workflow while deleting cache keys.
2525
set +e
2626
echo "Deleting caches..."
2727
for cacheKey in $cacheKeysForPR
@@ -30,4 +30,4 @@ jobs:
3030
done
3131
echo "Done"
3232
env:
33-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/commitflow-frontend.yml

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,51 @@ name: Frontend CI
33
on:
44
push:
55
branches:
6-
- master
6+
- master
77
pull_request:
88
branches:
9-
- master
9+
- master
1010

1111
jobs:
1212
hue-ui-checks-and-tests:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- name: Checkout
16-
uses: actions/checkout@v4
15+
- name: Checkout
16+
uses: actions/checkout@v4
1717

18-
- name: Cache npm with setup node
19-
uses: actions/setup-node@v4
20-
with:
21-
node-version: 20
22-
cache: 'npm'
18+
- name: Cache npm with setup node
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: 20
22+
cache: 'npm'
2323

24-
- name: Install npm dependencies
25-
run: npm ci
24+
- name: Install npm dependencies
25+
run: npm ci
2626

27-
- name: Run commit title format check
28-
run: ./tools/ci/check_for_commit_message.sh
27+
- name: Run commit title format check
28+
run: ./tools/ci/check_for_commit_message.sh
2929

30-
- name: Run npm version checker
31-
run: npm run check-pinned-versions
30+
- name: Run npm version checker
31+
run: npm run check-pinned-versions
3232

33-
- name: Run npm license checker
34-
run: npm run check-license
33+
- name: Run npm license checker
34+
run: npm run check-license
3535

36-
- name: Run npm absolute path detection
37-
run: npm run check-absolute-paths
36+
- name: Run npm absolute path detection
37+
run: npm run check-absolute-paths
3838

39-
- name: Run js lint check
40-
run: npm run lint
39+
- name: Run prettier check
40+
run: npm run prettier
4141

42-
- name: Run style lint check
43-
run: npm run style-lint
42+
- name: Run js lint check
43+
run: npm run lint
4444

45-
- name: Run js tests
46-
run: |
47-
# https://jestjs.io/docs/en/troubleshooting.html#tests-are-extremely-slow-on-docker-andor-continuous-integration-ci-server
48-
sed -i 's/"test": "jest"/"test": "jest --runInBand"/g' package.json
45+
- name: Run style lint check
46+
run: npm run style-lint
4947

50-
npm run test
48+
- name: Run js tests
49+
run: |
50+
# https://jestjs.io/docs/en/troubleshooting.html#tests-are-extremely-slow-on-docker-andor-continuous-integration-ci-server
51+
sed -i 's/"test": "jest"/"test": "jest --runInBand"/g' package.json
52+
53+
npm run test

‎.github/workflows/commitflow-py3.yml

Lines changed: 55 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,80 +3,78 @@ name: Python 3 CI
33
on:
44
push:
55
branches:
6-
- master
6+
- master
77
pull_request:
88
branches:
9-
- master
9+
- master
1010
jobs:
1111
hue-build-and-tests:
12-
1312
runs-on: ubuntu-latest
1413

1514
strategy:
1615
matrix:
1716
python-version: ['3.8', '3.9', '3.10', '3.11']
1817

1918
steps:
20-
- name: Checkout
21-
uses: actions/checkout@v4
22-
with:
23-
fetch-depth: 0
24-
25-
- name: Check commit title format
26-
run: |
27-
./tools/ci/check_for_commit_message.sh
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
2823

29-
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v5
31-
with:
32-
python-version: ${{ matrix.python-version }}
24+
- name: Check commit title format
25+
run: |
26+
./tools/ci/check_for_commit_message.sh
3327
34-
- name: Cache pip
35-
uses: actions/cache@v4
36-
with:
37-
# This path is specific to Ubuntu
38-
path: ~/.cache/pip
39-
key: ${{ runner.os }}-pip-${{ hashFiles('desktop/core/generate_requirements.py') }}
40-
restore-keys: |
41-
${{ runner.os }}-pip-
42-
${{ runner.os }}-
28+
- name: Set up Python ${{ matrix.python-version }}
29+
uses: actions/setup-python@v5
30+
with:
31+
python-version: ${{ matrix.python-version }}
4332

44-
- name: Setup node 20 and cache npm
45-
uses: actions/setup-node@v4
46-
with:
47-
node-version: 20
48-
cache: 'npm'
33+
- name: Cache pip
34+
uses: actions/cache@v4
35+
with:
36+
# This path is specific to Ubuntu
37+
path: ~/.cache/pip
38+
key: ${{ runner.os }}-pip-${{ hashFiles('desktop/core/generate_requirements.py') }}
39+
restore-keys: |
40+
${{ runner.os }}-pip-
41+
${{ runner.os }}-
4942
50-
- name: Build Hue
51-
run: |
52-
sudo apt-get update
53-
sudo apt-get install -y build-essential asciidoc libkrb5-dev libldap2-dev libsasl2-dev libxslt-dev libsasl2-modules-gssapi-mit libsnappy-dev libgdbm-dev
43+
- name: Setup node 20 and cache npm
44+
uses: actions/setup-node@v4
45+
with:
46+
node-version: 20
47+
cache: 'npm'
5448

55-
export PYTHON_VER=python${{ matrix.python-version }}
56-
export SKIP_PYTHONDEV_CHECK=true
57-
export ROOT=$PWD
58-
make apps test_prep
49+
- name: Build Hue
50+
run: |
51+
sudo apt-get update
52+
sudo apt-get install -y build-essential asciidoc libkrb5-dev libldap2-dev libsasl2-dev libxslt-dev libsasl2-modules-gssapi-mit libsnappy-dev libgdbm-dev
5953
60-
- name: Run unit tests
61-
run: |
62-
if [[ "${{ matrix.python-version }}" == "3.11" ]]; then
63-
./build/env/bin/pytest
64-
else
65-
./build/venvs/python${{ matrix.python-version }}/bin/pytest
66-
fi
54+
export PYTHON_VER=python${{ matrix.python-version }}
55+
export SKIP_PYTHONDEV_CHECK=true
56+
export ROOT=$PWD
57+
make apps test_prep
6758
68-
- name: Run python lint check
69-
run: |
70-
if [[ "${{ matrix.python-version }}" == "3.11" ]]; then
71-
PYTHONWARNINGS=always ./build/env/bin/hue runruff check
72-
else
73-
PYTHONWARNINGS=always ./build/venvs/python${{ matrix.python-version }}/bin/hue runruff check
74-
fi
59+
- name: Run unit tests
60+
run: |
61+
if [[ "${{ matrix.python-version }}" == "3.11" ]]; then
62+
./build/env/bin/pytest
63+
else
64+
./build/venvs/python${{ matrix.python-version }}/bin/pytest
65+
fi
7566
76-
- name: Upload reports
77-
if: matrix.python-version == '3.11'
78-
uses: actions/upload-artifact@v4
79-
with:
80-
name: hue-reports
81-
path: ./reports
67+
- name: Run python lint check
68+
run: |
69+
if [[ "${{ matrix.python-version }}" == "3.11" ]]; then
70+
PYTHONWARNINGS=always ./build/env/bin/hue runruff check
71+
else
72+
PYTHONWARNINGS=always ./build/venvs/python${{ matrix.python-version }}/bin/hue runruff check
73+
fi
8274
75+
- name: Upload reports
76+
if: matrix.python-version == '3.11'
77+
uses: actions/upload-artifact@v4
78+
with:
79+
name: hue-reports
80+
path: ./reports

‎.github/workflows/docs_lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
# point at your local server URL
3434
args: http://localhost:1313/ --exclude "https://issues.cloudera.org*|http://localhost:8005|http://localhost:5555*|https://issues.apache.org/jira*|https://github.com*|http://demo.gethue.com*|https://twitter.com/gethue|https://cdn.gethue.com/downloads/*|https://pypi.org*"
35-
fail: true # fail the job if any broken links are found
35+
fail: true # fail the job if any broken links are found
3636
format: markdown
3737

3838
- name: Tear down Hugo

0 commit comments

Comments
 (0)