Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not push to docker from dev PRs #2639

Merged
merged 2 commits into from
May 14, 2023
Merged

Do not push to docker from dev PRs #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
962c8e1
Do not push to docker from dev PRs
nvuillam May 14, 2023
9e575f1
[MegaLinter] Apply linters fixes
nvuillam May 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .automation/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ def generate_documentation():
+ "and **ready to use out of the box**, as a GitHub action or any CI system "
+ "**highly configurable** and **free for all uses**.\n\n"
+ "[**Upgrade to MegaLinter v7 !**]"
+ "https://github.com/oxsecurity/megalinter/issues/2608" #TODOV7: Replace link
+ "https://github.com/oxsecurity/megalinter/issues/2608" # TODOV7: Replace link
)
# Update README.md file
replace_in_file(
Expand Down
19 changes: 4 additions & 15 deletions .github/workflows/deploy-DEV.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,6 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to Docker Hub
if: |
(
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event_name == 'push' && github.repository == 'oxsecurity/megalinter')
)
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

###################################
# Build image locally for testing #
###################################
Expand All @@ -125,8 +114,8 @@ jobs:
BUILD_REVISION=${{ github.sha }}
BUILD_VERSION=${{ steps.image_tag.outputs.tag }}
MEGA_LINTER_BASE_IMAGE="oxsecurity/megalinter:beta"
load: false
push: true
load: true
push: false
secrets: |
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
tags: |
Expand Down Expand Up @@ -182,8 +171,8 @@ jobs:
BUILD_DATE=${{ env.BUILD_DATE }}
BUILD_REVISION=${{ github.sha }}
BUILD_VERSION=${{ steps.image_tag.outputs.tag }}
load: false
push: true
load: true
push: false
secrets: |
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
tags: |
Expand Down
4 changes: 3 additions & 1 deletion megalinter/utils_reporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ def build_markdown_summary(reporter_self, action_run_url):
)
for suggestion in reporter_self.master.flavor_suggestions:
build_version = config.get(None, "BUILD_VERSION", DEFAULT_RELEASE)
action_version = DEFAULT_RELEASE if len(build_version) > 20 else build_version
action_version = (
DEFAULT_RELEASE if len(build_version) > 20 else build_version
)
action_path = (
f"{ML_REPO}/flavors/{suggestion['flavor']}@{action_version}"
)
Expand Down