Skip to content

Commit 598a8d1

Browse files
committed
Make main the default branch
1 parent 5e237c7 commit 598a8d1

5 files changed

Lines changed: 19 additions & 10 deletions

File tree

.github/CONTRIBUTING.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Please note that the project has a code of conduct; please follow it in all your
1010

1111
== Pull requests
1212

13-
Pull requests target should be made on `develop` branch.
13+
Pull requests target should be made on `main` branch.

.github/antora-playbook.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ site:
33
url: https://rakambdaorg.github.io/ChannelPointsMiner/
44
start_page: miner::index.adoc
55
content:
6+
tags: '*'
7+
branches: [ 'main' ]
68
sources:
79
- url: https://github.com/RakambdaOrg/ChannelPointsMiner.git
8-
branches: [ main, develop ]
910
start_paths:
1011
- miner/docs
1112
- viewer/docs

.github/workflows/build-test-deploy.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ on:
44
push:
55
branches:
66
- main
7-
- develop
87
tags:
98
pull_request:
109
branches:
1110
- main
12-
- develop
1311
workflow_dispatch:
1412

1513
jobs:
@@ -186,7 +184,7 @@ jobs:
186184
needs:
187185
- test-miner
188186
- test-viewer
189-
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
187+
if: github.ref == 'refs/heads/main'
190188
concurrency: miner_docker_${{ github.ref }}
191189
environment: DockerHub
192190
steps:
@@ -217,7 +215,7 @@ jobs:
217215
needs:
218216
- test-miner
219217
- test-viewer
220-
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
218+
if: github.ref == 'refs/heads/main'
221219
concurrency: viewer_docker_${{ github.ref }}
222220
environment: DockerHub
223221
steps:

.github/workflows/manual-docker.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ name: Manually deploy docker
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
branch:
7+
type: string
8+
description: branch to build
9+
latest:
10+
type: boolean
11+
description: Build as latest
512

613
jobs:
714
publish-miner:
@@ -12,6 +19,8 @@ jobs:
1219
steps:
1320
- name: Checkout source
1421
uses: actions/checkout@v5
22+
with:
23+
ref: ${{ github.event.inputs.branch }}
1524
- name: Set up JDK
1625
uses: actions/setup-java@v5
1726
with:
@@ -33,7 +42,7 @@ jobs:
3342
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
3443
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
3544
- name: Push latest on Docker Hub
36-
if: success() && github.ref == 'refs/heads/main'
45+
if: success() && github.event.inputs.latest == 'true'
3746
run: |
3847
./gradlew \
3948
:miner:jib \
@@ -49,6 +58,8 @@ jobs:
4958
steps:
5059
- name: Checkout source
5160
uses: actions/checkout@v5
61+
with:
62+
ref: ${{ github.event.inputs.branch }}
5263
- name: Set up JDK
5364
uses: actions/setup-java@v5
5465
with:
@@ -70,7 +81,7 @@ jobs:
7081
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
7182
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
7283
- name: Push latest on Docker Hub
73-
if: success() && github.ref == 'refs/heads/main'
84+
if: success() && github.event.inputs.latest == 'true'
7485
run: |
7586
./gradlew \
7687
:viewer:jib \

.github/workflows/pages.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- develop
87
workflow_dispatch:
98

109
jobs:
@@ -19,7 +18,7 @@ jobs:
1918
- name: Install Node.js
2019
uses: actions/setup-node@v4
2120
with:
22-
node-version: '20'
21+
node-version: '24'
2322
- name: Install Antora
2423
run: npm i antora asciidoctor-kroki
2524

0 commit comments

Comments
 (0)