Skip to content

Commit fbe456b

Browse files
authored
Fix release process, take 2 (#369)
I've tested native-image building by modifying release.yml temporarily, so this time hopefully native-image building should work.
1 parent 2dfd615 commit fbe456b

File tree

4 files changed

+6
-134
lines changed

4 files changed

+6
-134
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: CI
22
on:
33
pull_request:
4-
branches: ['**']
54
push:
6-
branches: ['**']
5+
76
jobs:
87
run-tests:
98
runs-on: ubuntu-latest

.github/workflows/release.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Release
22
on:
33
push:
44
branches:
5+
- main
56
- master
67
jobs:
78
native-image:
@@ -36,12 +37,6 @@ jobs:
3637
echo "build --config github_actions" > user.bazelrc
3738
echo "build --disk_cache ${{ github.workspace }}/.bazel-cache/disk-cache" >> user.bazelrc
3839
echo "build --repository_cache ${{ github.workspace }}/.bazel-cache/repo-cache" >> user.bazelrc
39-
- name: Install bazel
40-
run: ./ci_scripts/ci_install_bazel.sh
41-
env:
42-
BAZEL_VERSION: ${{ matrix.bazel_version }}
43-
BAZEL_INSTALLER_SHA: ${{ matrix.bazel_installer_sha }}
44-
BAZEL_BIN_LOC: "${{ github.workspace }}/.bazel-cache/bazel-bin"
4540
- name: Build deploy jar
4641
run: ./ci_scripts/build_deploy_jar.sh
4742
env:
@@ -51,6 +46,7 @@ jobs:
5146
- name: Prepare outputs from platform run
5247
run: ./ci_scripts/prepare_output.sh bazel-deps.jar bazel-deps.jar staging-directory
5348
- uses: actions/upload-artifact@master
49+
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
5450
with:
5551
name: bazel-deps.jar
5652
path: staging-directory
@@ -61,13 +57,16 @@ jobs:
6157
- name: Prepare outputs from platform run
6258
run: ./ci_scripts/prepare_output.sh bazel-deps ${{ matrix.artifact }} staging-directory
6359
- uses: actions/upload-artifact@master
60+
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
6461
with:
6562
name: ${{ matrix.artifact }}
6663
path: staging-directory
64+
6765
make_release:
6866
name: Make release
6967
needs: native-image
7068
runs-on: ubuntu-20.04
69+
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
7170
steps:
7271
- uses: actions/checkout@v4
7372
- name: Download linux bazel-deps

ci_scripts/bootstrapping_bazel

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

ci_scripts/ci_install_bazel.sh

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

0 commit comments

Comments
 (0)