Skip to content

Commit

Permalink
Merge branch 'develop' into jb/melt
Browse files Browse the repository at this point in the history
  • Loading branch information
joemfb committed Dec 11, 2024
2 parents a4aa77e + 997ba3a commit 5959b62
Show file tree
Hide file tree
Showing 614 changed files with 275,757 additions and 5,241 deletions.
51 changes: 0 additions & 51 deletions .bazelrc

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
branches:
- develop
paths:
- '*.bazel'
- '.bazelrc'
- '.github/workflows/**.yml'
- 'PACE'
- 'VERSION'
- 'bazel/**'
- 'build.zig'
- 'build.zig.zon'
- 'ext/**'
- '!ext/**.md'
- 'pkg/**'
- '.github/workflows/**.yml'
- '*.sh'

jobs:
urbit:
Expand Down
58 changes: 27 additions & 31 deletions .github/workflows/docker-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,26 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: mlugg/setup-zig@v1
with:
version: 0.13.0

#
# BUILD OR READ FROM CACHE
# BUILD
#

- name: chown /usr/local
- name: Build binary
id: build
run: |
# See https://github.com/actions/cache/issues/845.
sudo chown $(whoami) /usr/local && (chown -R $USER /usr/local/*-musl || true)
zig build \
-Dtarget=x86_64-linux-musl \
-Doptimize=ReleaseFast \
-Dpace=${{inputs.pace}} \
--summary all
- name: Set up build cache
id: build-cache
uses: actions/cache@v3
with:
key: linux-x86_64-cache
path: |
# # Cache bazel path on Linux.
~/.cache/bazel/_bazel_$(whoami)
# Cache musl libc toolchains.
/usr/local/*-musl
- name: Install toolchains
if: steps.build-cache.outputs.cache-hit != 'true'
run: |
bazel run //bazel/toolchain:x86_64-linux-musl-gcc
cp zig-out/x86_64-linux-musl/urbit docker/.
- name: Install dependencies
run: sudo apt-get install -y autoconf-archive

- name: Set pace
run: echo "${{ inputs.pace }}" > ./PACE
echo version=v$(sed -nr 's/#define URBIT_VERSION "(.*)"/\1/p' zig-out/include/version.h) >> $GITHUB_OUTPUT
#
# UPLOAD TO DOCKER
Expand All @@ -66,12 +56,18 @@ jobs:
short_description: 'Urbit: a clean-slate OS and network for the 21st century'
readme_file: 'docker/README.md'

- name: Build and push version-tagged Docker image
run: bazel run //docker:push_version_x86_64

- name: Build and push pace-tagged Docker image
run: bazel run //docker:push_pace_x86_64
- name: Build and push
if: ${{ inputs.pace != 'live' }}
uses: docker/build-push-action@v6
with:
push: true
context: docker
tags: tloncorp/vere:${{ steps.build.outputs.version }},tloncorp/vere:${{ inputs.pace }}

- name: Build and push latest-tagged Docker image
- name: Build and push live
if: ${{ inputs.pace == 'live' }}
run: bazel run //docker:push_latest_x86_64
uses: docker/build-push-action@v6
with:
push: true
context: docker
tags: tloncorp/vere:latest
11 changes: 6 additions & 5 deletions .github/workflows/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ name: Feature pull request
on:
pull_request:
paths:
- '.bazelrc'
- '.github/workflows/*.yml'
- 'BUILD.bazel'
- 'WORKSPACE.bazel'
- 'bazel/**'
- 'build.zig'
- 'build.zig.zon'
- 'ext/**'
- '!ext/**.md'
- 'pkg/**'
- '.github/workflows/**.yml'
- '*.sh'

jobs:
urbit:
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ on:
branches:
- master
paths:
- '*.bazel'
- '.bazelrc'
- '.github/workflows/**.yml'
- 'PACE'
- 'VERSION'
- 'bazel/**'
- 'build.zig'
- 'build.zig.zon'
- 'ext/**'
- '!ext/**.md'
- 'pkg/**'

- '.github/workflows/**.yml'
- '*.sh'

jobs:
urbit:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
branches:
- 'next/kelvin/*'
paths:
- '*.bazel'
- '.bazelrc'
- '.github/workflows/**.yml'
- 'PACE'
- 'VERSION'
- 'bazel/**'
- 'build.zig'
- 'build.zig.zon'
- 'ext/**'
- '!ext/**.md'
- 'pkg/**'
- '.github/workflows/**.yml'
- '*.sh'

jobs:
urbit:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
branches:
- release
paths:
- '*.bazel'
- '.bazelrc'
- '.github/workflows/**.yml'
- 'PACE'
- 'VERSION'
- 'bazel/**'
- 'build.zig'
- 'build.zig.zon'
- 'ext/**'
- '!ext/**.md'
- 'pkg/**'
- '.github/workflows/**.yml'
- '*.sh'

jobs:
urbit:
Expand Down
Loading

0 comments on commit 5959b62

Please sign in to comment.