Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: function61/edgerouter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: daca1315ebeba6999fb3b18586177a8657f3975d
Choose a base ref
..
head repository: function61/edgerouter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e7593fdb1dc6667609fd1be924dfeab50045ccc5
Choose a head ref
Showing with 4 additions and 16 deletions.
  1. +1 −14 .config/turbobob.json
  2. +3 −2 .github/workflows/build.yml
15 changes: 1 addition & 14 deletions .config/turbobob.json
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
"builders": [
{
"name": "default",
"uses": "docker://fn61/buildkit-golang:20240908_1146_f9b94bc0",
"uses": "docker://fn61/buildkit-golang:20250109_1140_037f68db",
"mount_source": "",
"mount_destination": "/workspace",
"workdir": "/workspace",
@@ -21,19 +21,6 @@
"dev_pro_tips": [
"docker network connect fn61 tbdev-edgerouter-default"
]
},
{
"name": "publisher",
"uses": "docker://fn61/buildkit-publisher:20200228_1755_83c203ff",
"mount_destination": "/workspace",
"commands": {
"publish": ["publish-gh.sh", "function61/edgerouter", "rel/"],
"dev": ["bash"]
},
"pass_envs": [
"GITHUB_TOKEN",
"EVENTHORIZON"
]
}
],
"os_arches": {
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: docker/setup-buildx-action@v1

- name: Build
run: |
curl --fail --location --silent --output bob https://function61.com/go/turbobob-latest-stable-linux-amd64 && chmod +x bob
set -eu
curl --fail --location --no-progress-meter --output bob https://function61.com/go/turbobob-latest-stable-linux-amd64 && chmod +x bob
./bob build in-ci-autodetect-settings
env:
DOCKER_CREDS: ${{ secrets.DOCKER_CREDS }}