Skip to content

Commit 315ef60

Browse files
authored
Change repo layout and settings (#1438)
1 parent 318ea8c commit 315ef60

File tree

9 files changed

+67
-31
lines changed

9 files changed

+67
-31
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- [ ] All [tests](https://github.com/jfrog/jfrog-cli-core#tests) passed. If this feature is not already covered by the tests, I added new tests.
22
- [ ] All [static analysis checks](https://github.com/jfrog/jfrog-cli-core/actions/workflows/analysis.yml) passed.
3-
- [ ] This pull request is on the dev branch.
3+
- [ ] This pull request is on the master branch.
44
- [ ] I used gofmt for formatting the code before submitting the pull request.
55
-----

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "gomod"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
open-pull-requests-limit: 10
8+
groups:
9+
go:
10+
update-types:
11+
- minor
12+
- patch

.github/workflows/analysis.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ name: "Static Analysis"
22
on:
33
push:
44
branches:
5-
- '**'
5+
- "master"
66
tags-ignore:
7-
- '**'
7+
- "**"
88
pull_request:
9+
types: [opened, synchronize]
10+
branches:
11+
- "master"
912
jobs:
1013
Static-Check:
1114
runs-on: ubuntu-latest
@@ -29,4 +32,20 @@ jobs:
2932
uses: jfrog/.github/actions/install-go-with-cache@main
3033

3134
- name: Run Go-Sec scanner
32-
uses: jfrog/.github/actions/gosec-scanner@main
35+
uses: jfrog/.github/actions/gosec-scanner@main
36+
37+
No-Replace:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- name: Checkout Source
41+
uses: actions/checkout@v4
42+
43+
- name: Check for uncommented replace instructions
44+
run: |
45+
if grep -E '^[[:space:]]*replace[[:space:]]' go.mod; then
46+
echo "❌ Found uncommented replace directives in go.mod"
47+
echo "All replace directives should be commented out"
48+
exit 1
49+
else
50+
echo "✅ No uncommented replace directives found in go.mod"
51+
fi

.github/workflows/cla.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: "CLA Assistant"
22
on:
33
# issue_comment triggers this action on each comment on issues and pull requests
44
issue_comment:
5-
types: [ created ]
5+
types: [created]
66
pull_request_target:
7-
types: [ opened,synchronize ]
7+
types: [opened, synchronize]
8+
branches:
9+
- master
810

911
jobs:
1012
CLAssistant:
@@ -16,4 +18,4 @@ jobs:
1618
event_comment_body: ${{ github.event.comment.body }}
1719
event_name: ${{ github.event_name }}
1820
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19-
CLA_SIGN_TOKEN: ${{ secrets.CLA_SIGN_TOKEN }}
21+
CLA_SIGN_TOKEN: ${{ secrets.CLA_SIGN_TOKEN }}

.github/workflows/frogbot-scan-pull-request.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: "Frogbot Scan Pull Request"
22
on:
33
pull_request_target:
4-
types: [ opened, synchronize ]
4+
types: [opened, synchronize]
5+
branches:
6+
- master
57
permissions:
68
pull-requests: write
79
contents: read
@@ -119,4 +121,4 @@ jobs:
119121
# [Optional]
120122
# Set the minimum severity for vulnerabilities that should be fixed and commented on in pull requests
121123
# The following values are accepted: Low, Medium, High or Critical
122-
# JF_MIN_SEVERITY: ""
124+
# JF_MIN_SEVERITY: ""

.github/workflows/frogbot-scan-repository.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
# The repository scanning will be triggered periodically on the following branches.
17-
branch: [ "dev" ]
17+
branch: ["master"]
1818
steps:
1919
- name: Setup Go with cache
2020
uses: jfrog/.github/actions/install-go-with-cache@main
@@ -125,4 +125,4 @@ jobs:
125125

126126
# [Optional, Default: eco-system+frogbot@jfrog.com]
127127
# Set the email of the commit author
128-
# JF_GIT_EMAIL_AUTHOR: ""
128+
# JF_GIT_EMAIL_AUTHOR: ""
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
name: Monitor Issues
1+
name: Monitor Issues and Pull Requests
22
on:
33
workflow_dispatch:
44
inputs:
55
operations-per-run:
6-
description: 'Number of operations per run'
6+
description: "Number of operations per run"
77
required: false
8-
default: '30'
8+
default: "30"
99
schedule:
10-
- cron: "0 0 * * *" # Runs once a day at midnight
10+
- cron: "0 0 * * *" # Runs once a day at midnight
1111
jobs:
12-
monitor-issues:
12+
monitor-issues-and-pull-requests:
1313
runs-on: ubuntu-latest
1414
permissions:
1515
issues: write
1616
steps:
1717
- uses: actions/stale@v9
1818
with:
1919
# Ignore issues with these labels
20-
exempt-issue-labels: 'feature request,question'
20+
exempt-issue-labels: "feature request,question"
2121
# Days of inactivity before marking an issue as stale
22-
days-before-issue-stale: 180
22+
days-before-stale: 180
2323
# Days of inactivity before closing an issue
24-
days-before-issue-close: 7
24+
days-before-close: 7
2525
# Name of the stale label
2626
stale-issue-label: "stale"
2727
stale-issue-message: "This issue has been marked as stale due to 6 months of inactivity. As part of our effort to address every issue properly, please feel free to remove the stale label or keep this issue active by leaving a comment. Otherwise, it will be closed in 7 days"
2828
close-issue-message: "This issue was closed due to 7 days of inactivity after being marked as stale. Feel free to reopen it if it remains relevant."
29-
# Ignore pull requests
30-
days-before-pr-close: false
31-
days-before-pr-stale: false
29+
stale-pr-label: "stale"
30+
stale-pr-message: "This pull-request has been marked as stale due to 6 months of inactivity. As part of our effort to address every issue properly, please feel free to remove the stale label or keep this issue active by leaving a comment. Otherwise, it will be closed in 7 days"
31+
close-pr-message: "This pull-request was closed due to 7 days of inactivity after being marked as stale. Feel free to reopen it if it remains relevant."
3232
ascending: true
3333
# Get from input or resolve to default
3434
operations-per-run: ${{ github.event.inputs.operations-per-run || '30' }}
35-
repo-token: ${{ secrets.GITHUB_TOKEN }}
35+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
name: JFrog CLI Core Tests
22
on:
3+
workflow_dispatch:
34
push:
45
branches:
5-
- '**'
6+
- master
67
tags-ignore:
7-
- '**'
8+
- "**"
89
pull_request:
10+
branches:
11+
- master
912
jobs:
1013
test:
1114
runs-on: ${{ matrix.os }}-latest
1215
strategy:
1316
fail-fast: false
1417
matrix:
15-
os: [ ubuntu, windows, macos ]
18+
os: [ubuntu, windows, macos]
1619
env:
1720
GOPROXY: direct
1821
GRADLE_OPTS: -Dorg.gradle.daemon=false
@@ -24,7 +27,7 @@ jobs:
2427
uses: actions/setup-python@v5
2528
with:
2629
python-version: "3.x"
27-
30+
2831
- name: Install pipenv & poetry
2932
run: python -m pip install pipenv poetry
3033

@@ -36,7 +39,7 @@ jobs:
3639
- name: Install dotnet
3740
uses: actions/setup-dotnet@v4
3841
with:
39-
dotnet-version: '6.x'
42+
dotnet-version: "6.x"
4043

4144
- name: Install pnpm
4245
uses: pnpm/action-setup@v4
@@ -53,7 +56,7 @@ jobs:
5356
echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
5457
sudo apt-get update
5558
sudo apt-get install -y mono-complete
56-
59+
5760
- name: Setup Go with cache
5861
uses: jfrog/.github/actions/install-go-with-cache@main
5962

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
| Branch | Status |
99
|:------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
1010
| master | [![Test](https://github.com/jfrog/jfrog-cli-core/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/jfrog/jfrog-cli-core/actions/workflows/test.yml?query=branch%3Amaster) [![Static Analysis](https://github.com/jfrog/jfrog-cli-core/actions/workflows/analysis.yml/badge.svg?branch=master)](https://github.com/jfrog/jfrog-cli-core/actions/workflows/analysis.yml) |
11-
| dev | [![Test](https://github.com/jfrog/jfrog-cli-core/actions/workflows/test.yml/badge.svg?branch=dev)](https://github.com/jfrog/jfrog-cli-core/actions/workflows/test.yml?query=branch%3Adev) [![Static Analysis](https://github.com/jfrog/jfrog-cli-core/actions/workflows/analysis.yml/badge.svg?branch=dev)](https://github.com/jfrog/jfrog-cli-core/actions/workflows/analysis.yml) |
1211

1312
## General
1413

@@ -21,7 +20,6 @@ We welcome pull requests from the community.
2120
### Guidelines
2221

2322
- If the existing tests do not already cover your changes, please add tests.
24-
- Pull requests should be created on the **dev** branch.
2523
- Please use gofmt for formatting the code before submitting the pull request.
2624

2725
# Tests

0 commit comments

Comments
 (0)