Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump dependencies #135

Merged
merged 6 commits into from
Oct 30, 2024
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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0
6.4.0
4 changes: 2 additions & 2 deletions .github/workflows/snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: craft
runs-on: ubuntu-18.04 # FIXME: https://github.com/samuelmeuli/action-snapcraft/issues/24
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: samuelmeuli/action-snapcraft@v1
with:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Build snap
run: sg lxd -c 'snapcraft --use-lxd'

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: snapped
path: '*.snap'
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,36 @@ defaults:

jobs:
bazel-sync:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: DOCKER_BUILDKIT=1 docker build -o=. --target=sync . --progress=plain
- run: git --no-pager diff --exit-code
continue-on-error: true

build_on_ubuntu_with_gcc:
name: on ubuntu with GCC
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: DOCKER_BUILDKIT=1 docker build -o=./bin/ --target=voidstar . --progress=plain
- run: ./bin/voidstar --help
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: voidstar_gcc_ubuntu
path: ./bin/voidstar
- run: DOCKER_BUILDKIT=1 docker build -o=. --target=video-gcc . --progress=plain
- run: mv ./bin/voidstar voidstar_gcc_ubuntu
- run: mv ./video.mp4 video_gcc_ubuntu.mp4
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: video-gcc_ubuntu
path: ./video_gcc_ubuntu.mp4
Expand All @@ -55,23 +55,23 @@ jobs:

build_on_ubuntu_with_clang:
name: on ubuntu with Clang
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: DOCKER_BUILDKIT=1 docker build -o=./bin/ --target=voidstar-clang . --progress=plain
- run: ./bin/voidstar --help
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: voidstar_clang_ubuntu
path: ./bin/voidstar
- run: DOCKER_BUILDKIT=1 docker build -o=. --target=video-clang . --progress=plain
- run: mv ./bin/voidstar voidstar_clang_ubuntu
- run: mv ./video.mp4 video_clang_ubuntu.mp4
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: video-clang_ubuntu
path: ./video_clang_ubuntu.mp4
Expand All @@ -86,8 +86,8 @@ jobs:
name: on macos
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: ~/.cache/bazel
key: bazel
Expand All @@ -102,7 +102,7 @@ jobs:
chmod +w voidstar_clang_macos
strip voidstar_clang_macos
- run: ./voidstar_clang_macos --help
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: voidstar_macos-latest
path: voidstar_clang_macos
Expand All @@ -115,9 +115,9 @@ jobs:
name: on windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: bazelbuild/setup-bazelisk@v1
- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: ~/.cache/bazel
key: bazel
Expand All @@ -135,7 +135,7 @@ jobs:
# - run: ls -lha ./bazel-bin/voidstar/
# - run: strip ./bazel-bin/voidstar/voidstar.exe
# - run: ./bazel-bin/voidstar/voidstar.exe --help
# - uses: actions/upload-artifact@v2
# - uses: actions/upload-artifact@v4
# with:
# name: voidstar_windows-latest
# path: ./bazel-bin/voidstar/voidstar.exe
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker.io/docker/dockerfile:1@sha256:39b85bbfa7536a5feceb7372a0817649ecb2724562a38360f4d6a7782a409b14
# syntax=docker.io/docker/dockerfile:1@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5

FROM --platform=$BUILDPLATFORM docker.io/library/ubuntu@sha256:67211c14fa74f070d27cc59d69a7fa9aeff8e28ea118ef3babc295a0428a6d21 AS ubuntu
FROM --platform=$BUILDPLATFORM docker.io/library/ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS ubuntu

ARG BUILDOS
ARG BUILDARCH
Expand Down Expand Up @@ -41,7 +41,7 @@ RUN \
--mount=type=cache,target=/root/.cache/bazel \
--mount=type=cache,target=/root/.cache/bazelisk \
set -ux \
&& curl -#fsSLo /bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-$BUILDOS-$BUILDARCH \
&& curl -#fsSLo /bazelisk https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-$BUILDOS-$BUILDARCH \
&& chmod +x /bazelisk \
&& cd /usr/local/bin \
&& ln -s /bazelisk bazel \
Expand All @@ -52,7 +52,7 @@ COPY . .
FROM base AS buildifier
RUN \
set -ux \
&& curl -#fsSLo /buildifier "https://github.com/bazelbuild/buildtools/releases/download/$(cat .bazelversion)/buildifier-$BUILDOS-$BUILDARCH" \
&& curl -#fsSLo /buildifier "https://github.com/bazelbuild/buildtools/releases/download/v$(cat .bazelversion)/buildifier-$BUILDOS-$BUILDARCH" \
&& chmod +x /buildifier

# sync
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ load("@bazel_upgradable//:rule.bzl", "upgradable_repository")

upgradable_repository(
name = "rules_cc",
branch = "main",
tag = "0.0.7",
remote = "https://github.com/bazelbuild/rules_cc.git",
)

Expand Down
Loading
Loading