Skip to content

Commit 0dd0343

Browse files
committed
Merge branch 'main' of https://github.com/oracle/macaron into pgovale/ui-enhancements
Signed-off-by: Parth Govale <parth.govale@oracle.com>
2 parents 3634c6d + 92e9032 commit 0dd0343

File tree

147 files changed

+8674
-21156
lines changed

Some content is hidden

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

147 files changed

+8674
-21156
lines changed

.flake8

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ ignore = E203,E266,E501,W503,D105,D404,PT009
4747
# D107: Missing docstring in __init__
4848
# PT004: Fixture does not return anything, add leading underscore
4949
# B903: Data class should either be immutable or use __slots__ to save memory
50+
# T201: Check for Print statements in python files.
5051
per-file-ignores =
5152
__init__.py:D104
5253
tests/*:D400,D200,D102,D104,D107,PT004
5354
src/macaron/database/views.py:B903
55+
tests/schema_validation/json_schema_validate.py:T201
56+
tests/integration/cases/run_macaron_sh_script_unit_test/test_run_macaron_sh.py:T201
5457

5558
max-line-length = 120
5659
show-source = true

.github/workflows/_build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
33

44
# This is a trusted builder implemented as a reusable workflow that can be called by other
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353

5454
- name: Check out repository
55-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
55+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5656
with:
5757
fetch-depth: 0
5858

.github/workflows/_build_docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828

2929
- name: Check out repository
30-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
30+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3131
with:
3232
fetch-depth: 0
3333

@@ -38,7 +38,7 @@ jobs:
3838
python-version: '3.11'
3939

4040
- name: Download artifact
41-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
41+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
4242
with:
4343
name: ${{ inputs.artifact-name }}
4444
path: dist

.github/workflows/_deploy-github-pages.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023 - 2023, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2023 - 2025, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
33

44
# This workflow deploys the documentations to GitHub Pages.
@@ -30,12 +30,12 @@ jobs:
3030
steps:
3131

3232
- name: Check out repository
33-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
33+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434
with:
3535
fetch-depth: 0
3636

3737
- name: Download artifact
38-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
38+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
3939
with:
4040
name: ${{ inputs.artifact-name }}
4141
path: dist

.github/workflows/_generate-rebase.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737

3838
- name: Check out repository
39-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040
with:
4141
fetch-depth: 0
4242
token: ${{ secrets.REPO_ACCESS_TOKEN }}

.github/workflows/build_base_image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023 - 2023, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2023 - 2025, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
33

44
# This workflow builds the base Docker image. The base image will be pushed to ghcr.io.
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020

2121
- name: Check out repository
22-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
with:
2424
fetch-depth: 0
2525

.github/workflows/build_semgrep_wheel.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# change the version tag in the 'name' description
2727
# change the 'ref' field to use the commit hash of that tag
2828
- name: Check out Semgrep v1.113.0 repository
29-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
29+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3030
with:
3131
repository: semgrep/semgrep.git
3232
ref: 4729a05d24bf9cee8face447e8a6d418037d61d8 # v1.113.0

.github/workflows/codeql-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838

3939
- name: Checkout repository
40-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
40+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4141

4242
- name: Set up Python
4343
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0

.github/workflows/pr-conventional-commits.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 - 2024, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
33

44
# This workflow lints the PR's title and commits. It uses the commitizen
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626

2727
- name: Check out repository
28-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
28+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2929
with:
3030
fetch-depth: 0
3131

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
steps:
4040

4141
- name: Check out repository
42-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
42+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4343
with:
4444
fetch-depth: 0
4545
token: ${{ secrets.REPO_ACCESS_TOKEN }}
@@ -115,7 +115,7 @@ jobs:
115115
steps:
116116

117117
- name: Check out repository
118-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
118+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
119119
with:
120120
fetch-depth: 0
121121

@@ -131,7 +131,7 @@ jobs:
131131
} >> "$GITHUB_OUTPUT"
132132
133133
- name: Download artifact
134-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
134+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
135135
with:
136136
name: ${{ env.ARTIFACT_NAME }}
137137
path: dist
@@ -305,12 +305,12 @@ jobs:
305305
# steps:
306306

307307
# - name: Check out repository
308-
# uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
308+
# uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
309309
# with:
310310
# fetch-depth: 0
311311

312312
# - name: Download provenance
313-
# uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
313+
# uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
314314
# with:
315315
# name: ${{ needs.provenance.outputs.provenance-name }}
316316

0 commit comments

Comments
 (0)