Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ Security is a priority. We maintain a proactive stance to identify and fix vulne
<br/>

## 🛠️ Supported & Maintained Versions

| Version | Status |
|---------|----------------------|
| 0.x.x | ✅ Supported & Active |
| 1.x.x | ✅ Supported & Active |
Any released version of **go-subtree** that is not marked as deprecated is actively supported and maintained.

<br/>

Expand Down Expand Up @@ -70,7 +66,7 @@ We follow the [OpenSSF](https://openssf.org) best practices to ensure this repos

To proactively protect this repository, we use several automated GitHub workflows:

- **[CodeQL Analysis](./workflows/codeql-analysis.yml)**: Scans the codebase for security vulnerabilities and coding errors using GitHub's CodeQL engine on every push and pull request to the `master` branch.
- **[OpenSSF Scorecard](./workflows/scorecard.yml)**: Periodically evaluates the repository against OpenSSF Scorecard checks, providing insights and recommendations for improving supply chain security and best practices.
- **[CodeQL Analysis](./github/workflows/codeql-analysis.yml)**: Scans the codebase for security vulnerabilities and coding errors using GitHub's CodeQL engine on every push and pull request to the `main/master` branch.
- **[OpenSSF Scorecard](./github/workflows/scorecard.yml)**: Periodically evaluates the repository against OpenSSF Scorecard checks, providing insights and recommendations for improving supply chain security and best practices.

These workflows help us identify, remediate, and prevent security issues as early as possible in the development lifecycle. For more details, see the workflow files in the [`.github/workflows/`](https://github.com/bsv-blockchain/go-subtree/tree/master/.github/workflows) directory.
These workflows help us identify, remediate, and prevent security issues as early as possible in the development lifecycle. For more details, see the workflow files in the [`.github/workflows/`](.github/workflows) directory.
2 changes: 1 addition & 1 deletion .github/tech-conventions/dependency-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ brew install gitleaks
gitleaks detect --source . --log-opts="--all" --verbose
```

* Address critical advisories before merging changes into `master`
* Address critical advisories before merging changes into `main/master`

* Document any intentionally ignored vulnerabilities with clear justification and issue tracking

Expand Down
2 changes: 1 addition & 1 deletion .github/tech-conventions/labeling-conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> Labels serve as shared vocabulary for categorizing issues, pull requests, and discussions. Proper labeling improves triage, prioritization, automation, and clarity across the engineering lifecycle.

Current labels are located in `.github/labels.yml` and automatically synced into GitHub upon updating the `master` branch.
Current labels are located in `.github/labels.yml` and automatically synced into GitHub upon updating the `main/master` branch.

<br><br>

Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/fortress-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,17 @@ jobs:
--jq ".workflow_runs[] | select(.status == \"completed\" and (.conclusion == \"success\" or .conclusion == \"failure\") and .head_branch == \"$CURRENT_BRANCH\") | .id" \
--paginate 2>/dev/null | head -8 || echo "")

# If no runs found for current branch and it's not master, also get master branch history
if [[ -z "$WORKFLOW_RUNS" ]] && [[ "$CURRENT_BRANCH" != "master" ]]; then
echo "ℹ️ No history found for branch '$CURRENT_BRANCH', checking master branch..."
WORKFLOW_RUNS=$(gh api repos/${{ github.repository }}/actions/runs \
--jq '.workflow_runs[] | select(.status == "completed" and (.conclusion == "success" or .conclusion == "failure") and .head_branch == "master") | .id' \
--paginate 2>/dev/null | head -5 || echo "")
# If no runs found for current branch and it's not the default branch, check default branch history
if [[ -z "$WORKFLOW_RUNS" ]]; then
# Detect the default branch dynamically
DEFAULT_BRANCH=$(gh api repos/${{ github.repository }} --jq '.default_branch' 2>/dev/null || echo "")

if [[ -n "$DEFAULT_BRANCH" ]] && [[ "$CURRENT_BRANCH" != "$DEFAULT_BRANCH" ]]; then
echo "ℹ️ No history found for branch '$CURRENT_BRANCH', checking $DEFAULT_BRANCH branch..."
WORKFLOW_RUNS=$(gh api repos/${{ github.repository }}/actions/runs \
--jq ".workflow_runs[] | select(.status == \"completed\" and (.conclusion == \"success\" or .conclusion == \"failure\") and .head_branch == \"$DEFAULT_BRANCH\") | .id" \
--paginate 2>/dev/null | head -5 || echo "")
fi
fi

if [[ -z "$WORKFLOW_RUNS" ]]; then
Expand Down Expand Up @@ -922,7 +927,7 @@ jobs:
GITHUB_SHA: ${{ inputs.commit-sha || github.event.pull_request.head.sha }}
GITHUB_REF_NAME: ${{ inputs.branch-name || github.event.pull_request.head.ref }}
GITHUB_HEAD_REF: ${{ github.event.pull_request.head.ref }}
GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref || 'master' }}
GITHUB_BASE_REF: ${{ github.event.pull_request.base.ref || github.event.repository.default_branch }}
COVERAGE_PR_COMMENT_BEHAVIOR: ${{ env.COVERAGE_PR_COMMENT_BEHAVIOR }}
COVERAGE_LOG_LEVEL: debug
run: |
Expand Down
8 changes: 6 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
"default": "master",
"description": "Target branch for version bump",
"id": "targetBranch",
"type": "promptString"
"options": [
"master",
"main"
],
"type": "pickString"
},
{
"default": "cancel",
Expand Down Expand Up @@ -675,7 +679,7 @@
"type": "shell"
},
{
"command": "magex version:bump push=true bump=major branch=${input:targetBranch} confirm=${input:majorConfirm}",
"command": "magex version:bump push=true bump=major branch=${input:targetBranch} ${input:majorConfirm}",
"detail": "Bump major version (X.0.0) and push to remote - requires confirmation",
"group": "none",
"label": "magex: version:bump:major",
Expand Down