Skip to content

Commit 2bbcc7d

Browse files
authored
Merge pull request #745 from skip-mev/housekeeping/remove-unused-things
Housekeeping/remove unused things
2 parents 8ac9f8f + 8c2d8d4 commit 2bbcc7d

25 files changed

+13402
-51395
lines changed

.github/workflows/deploy-dev.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,19 @@ jobs:
2020
name: Checkout
2121
uses: actions/checkout@v4
2222
with:
23-
ref: dev
23+
ref: main
24+
fetch-depth: 0
2425

2526
- id: configure
26-
name: configure
27-
run: git config pull.ff true
27+
name: Configure git
28+
run: |
29+
git config user.name "GitHub Actions"
30+
git config user.email "actions@github.com"
2831
29-
- id: pull-main
30-
name: Pull latest 'main'
31-
run: git pull --ff-only origin main
32-
33-
- id: diff-check
34-
name: Check if 'dev' is behind 'main'
35-
run: git diff --exit-code origin/main
36-
37-
- id: fast-forward
38-
name: Fast forward 'main' → 'dev'
39-
run: git merge --ff-only origin/main
40-
41-
- id: push-dev
42-
name: Push latest 'dev'
43-
run: git push --set-upstream origin dev
32+
- id: sync-dev
33+
name: Sync 'main' → 'dev'
34+
run: |
35+
git fetch origin dev:dev || git branch dev
36+
git checkout dev
37+
git reset --hard origin/main
38+
git push --force origin dev

.github/workflows/deploy-testnet-dev.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,19 @@ jobs:
2020
name: Checkout
2121
uses: actions/checkout@v4
2222
with:
23-
ref: testnet-dev
23+
ref: main
24+
fetch-depth: 0
2425

2526
- id: configure
26-
name: configure
27-
run: git config pull.ff true
27+
name: Configure git
28+
run: |
29+
git config user.name "GitHub Actions"
30+
git config user.email "actions@github.com"
2831
29-
- id: pull-main
30-
name: Pull latest 'main'
31-
run: git pull --ff-only origin main
32-
33-
- id: diff-check
34-
name: Check if 'testnet-dev' is behind 'main'
35-
run: git diff --exit-code origin/main
36-
37-
- id: fast-forward
38-
name: Fast forward 'main' → 'testnet-dev'
39-
run: git merge --ff-only origin/main
40-
41-
- id: push-testnet-dev
42-
name: Push latest 'testnet-dev'
43-
run: git push --set-upstream origin testnet-dev
32+
- id: sync-testnet-dev
33+
name: Sync 'main' → 'testnet-dev'
34+
run: |
35+
git fetch origin testnet-dev:testnet-dev || git branch testnet-dev
36+
git checkout testnet-dev
37+
git reset --hard origin/main
38+
git push --force origin testnet-dev

.github/workflows/deploy-testnet.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,19 @@ jobs:
2020
name: Checkout
2121
uses: actions/checkout@v4
2222
with:
23-
ref: testnet
23+
ref: main
24+
fetch-depth: 0
2425

2526
- id: configure
26-
name: configure
27-
run: git config pull.ff true
27+
name: Configure git
28+
run: |
29+
git config user.name "GitHub Actions"
30+
git config user.email "actions@github.com"
2831
29-
- id: pull-main
30-
name: Pull latest 'main'
31-
run: git pull --ff-only origin main
32-
33-
- id: diff-check
34-
name: Check if 'testnet' is behind 'main'
35-
run: git diff --exit-code origin/main
36-
37-
- id: fast-forward
38-
name: Fast forward 'main' → 'testnet'
39-
run: git merge --ff-only origin/main
40-
41-
- id: push-testnet
42-
name: Push latest 'testnet'
43-
run: git push --set-upstream origin testnet
32+
- id: sync-testnet
33+
name: Sync 'main' → 'testnet'
34+
run: |
35+
git fetch origin testnet:testnet || git branch testnet
36+
git checkout testnet
37+
git reset --hard origin/main
38+
git push --force origin testnet

.github/workflows/tests-release.yml

Lines changed: 0 additions & 148 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)