fixup backport
This commit is contained in:
Rin Kuryloski
parent
2c62185317
commit
dd62ac16f3
|
|
@ -1,93 +0,0 @@
|
||||||
name: Update Elixir Patch Versions for Bazel Based Workflows
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 3 * * *'
|
|
||||||
workflow_dispatch:
|
|
||||||
jobs:
|
|
||||||
update-toolchains:
|
|
||||||
name: Update Elixir Versions
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
strategy:
|
|
||||||
max-parallel: 1
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include:
|
|
||||||
- elixir_version: "1.13"
|
|
||||||
name: '1_13'
|
|
||||||
- elixir_version: "1.14"
|
|
||||||
name: '1_14'
|
|
||||||
- elixir_version: "1.15"
|
|
||||||
name: '1_15'
|
|
||||||
timeout-minutes: 10
|
|
||||||
env:
|
|
||||||
branch: bump-elixir-${{ matrix.elixir_version }}
|
|
||||||
steps:
|
|
||||||
- name: CHECKOUT REPOSITORY
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: FAIL IF THE PR ALREADY EXISTS
|
|
||||||
id: check-for-branch
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
if git ls-remote --exit-code --heads origin ${{ env.branch }}; then
|
|
||||||
echo "Branch ${{ env.branch }} already exits"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- name: DETERMINE LATEST PATCH & SHA
|
|
||||||
id: fetch-version
|
|
||||||
run: |
|
|
||||||
TAG_NAME=$(curl -s GET https://api.github.com/repos/elixir-lang/elixir/tags?per_page=100 \
|
|
||||||
| jq -r 'map(select(.name | contains("v${{ matrix.elixir_version }}"))) | first | .name')
|
|
||||||
|
|
||||||
if [[ -z "${TAG_NAME}" ]]; then
|
|
||||||
echo "Failed to determine latest TAG_NAME for v${{ matrix.elixir_version }}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
ARCHIVE_URL="https://github.com/elixir-lang/elixir/archive/${TAG_NAME}.tar.gz"
|
|
||||||
wget --continue --quiet --output-document="/tmp/elixir.tar.gz" "${ARCHIVE_URL}" && \
|
|
||||||
SHA="$(shasum -a 256 "/tmp/elixir.tar.gz" | awk '{print $1}')"
|
|
||||||
|
|
||||||
if [[ -z "${SHA}" ]]; then
|
|
||||||
echo "Failed to determine SHA for ${TAG_NAME}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "VERSION=${TAG_NAME#v}" >> $GITHUB_OUTPUT
|
|
||||||
echo "SHA=${SHA}" >> $GITHUB_OUTPUT
|
|
||||||
- name: MODIFY VERSION FILE
|
|
||||||
run: |
|
|
||||||
sudo npm install --global --silent @bazel/buildozer
|
|
||||||
|
|
||||||
OLD_SHA="$(cat MODULE.bazel | buildozer 'print sha256' -:${{ matrix.name }})"
|
|
||||||
OLD_VERSION="$(cat MODULE.bazel | buildozer 'print version' -:${{ matrix.name }})"
|
|
||||||
|
|
||||||
echo "OLD_SHA: $OLD_SHA"
|
|
||||||
echo "OLD_VERSION: $OLD_VERSION"
|
|
||||||
|
|
||||||
echo "$(cat MODULE.bazel | buildozer 'set sha256 "${{ steps.fetch-version.outputs.SHA }}"' -:${{ matrix.name }})" > MODULE.bazel
|
|
||||||
echo "$(cat MODULE.bazel | buildozer 'set version "${{ steps.fetch-version.outputs.VERSION }}"' -:${{ matrix.name }})" > MODULE.bazel
|
|
||||||
|
|
||||||
echo "MODULE.bazel updated"
|
|
||||||
|
|
||||||
set -x
|
|
||||||
git diff
|
|
||||||
- name: CREATE PULL REQUEST
|
|
||||||
uses: peter-evans/create-pull-request@v6.0.0
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.REPO_SCOPED_TOKEN }}
|
|
||||||
committer: GitHub <noreply@github.com>
|
|
||||||
author: GitHub <noreply@github.com>
|
|
||||||
title: Adopt elixir ${{ steps.fetch-version.outputs.VERSION }}
|
|
||||||
body: >
|
|
||||||
Automated changes created by
|
|
||||||
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
|
||||||
using the [create-pull-request](https://github.com/peter-evans/create-pull-request)
|
|
||||||
GitHub action in the ${{ github.workflow }} workflow.
|
|
||||||
commit-message: |
|
|
||||||
Adopt elixir ${{ steps.fetch-version.outputs.VERSION }}
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
backport-v3.11.x
|
|
||||||
backport-v3.10.x
|
|
||||||
branch: ${{ env.branch }}
|
|
||||||
delete-branch: true
|
|
||||||
|
|
@ -1,143 +0,0 @@
|
||||||
name: Update OTP Patch Versions for Bazel Based Workflows
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 3 * * *'
|
|
||||||
workflow_dispatch:
|
|
||||||
jobs:
|
|
||||||
update-toolchains:
|
|
||||||
name: Update OTP Versions
|
|
||||||
runs-on: ubuntu-22.04
|
|
||||||
strategy:
|
|
||||||
max-parallel: 1
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
erlang_version:
|
|
||||||
- "25.0"
|
|
||||||
- "25.1"
|
|
||||||
- "25.2"
|
|
||||||
- "25.3"
|
|
||||||
- "26.1"
|
|
||||||
- "26.2"
|
|
||||||
include:
|
|
||||||
- erlang_version: "25.0"
|
|
||||||
name: '25_0'
|
|
||||||
branch: main
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
backport-v3.11.x
|
|
||||||
- erlang_version: "25.1"
|
|
||||||
name: '25_1'
|
|
||||||
branch: main
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
backport-v3.11.x
|
|
||||||
- erlang_version: "25.2"
|
|
||||||
name: '25_2'
|
|
||||||
branch: main
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
backport-v3.11.x
|
|
||||||
- erlang_version: "25.3"
|
|
||||||
name: '25_3'
|
|
||||||
branch: main
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
backport-v3.11.x
|
|
||||||
- erlang_version: "26.1"
|
|
||||||
name: '26_1'
|
|
||||||
branch: main
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
- erlang_version: "26.2"
|
|
||||||
name: '26_2'
|
|
||||||
branch: main
|
|
||||||
labels: |
|
|
||||||
backport-v3.12.x
|
|
||||||
timeout-minutes: 10
|
|
||||||
env:
|
|
||||||
branch: bump-otp-${{ matrix.erlang_version }}
|
|
||||||
steps:
|
|
||||||
- name: CHECKOUT REPOSITORY
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: ${{ matrix.branch }}
|
|
||||||
- name: FAIL IF THE PR ALREADY EXISTS
|
|
||||||
id: check-for-branch
|
|
||||||
run: |
|
|
||||||
set +e
|
|
||||||
if git ls-remote --exit-code --heads origin ${{ env.branch }}; then
|
|
||||||
echo "Branch ${{ env.branch }} already exits"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
- name: DETERMINE LATEST PATCH & SHA
|
|
||||||
id: fetch-version
|
|
||||||
run: |
|
|
||||||
TAG_NAME=$(curl -s GET https://api.github.com/repos/erlang/otp/tags?per_page=100 \
|
|
||||||
| jq -r 'map(select(.name | contains("OTP-${{ matrix.erlang_version }}"))) | first | .name')
|
|
||||||
VERSION=${TAG_NAME#OTP-}
|
|
||||||
|
|
||||||
if [[ -z "${VERSION}" ]]; then
|
|
||||||
echo "Failed to determine latest VERSION for OTP-${{ matrix.erlang_version }}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
ARCHIVE_RBE_URL="https://github.com/erlang/otp/releases/download/${TAG_NAME}/otp_src_${VERSION}.tar.gz"
|
|
||||||
wget --continue --quiet --output-document="/tmp/otp_src_${VERSION}.tar.gz" "${ARCHIVE_RBE_URL}"
|
|
||||||
SHA="$(shasum -a 256 "/tmp/otp_src_${VERSION}.tar.gz" | awk '{print $1}')"
|
|
||||||
|
|
||||||
if [[ -z "${SHA}" ]]; then
|
|
||||||
echo "Failed to determine SHA for ${TAG_NAME}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
ARCHIVE_OCI_URL="https://github.com/erlang/otp/archive/OTP-${VERSION}.tar.gz"
|
|
||||||
wget --continue --quiet --output-document="/tmp/OTP-${VERSION}.tar.gz" "${ARCHIVE_OCI_URL}"
|
|
||||||
SHA2="$(shasum -a 256 "/tmp/OTP-${VERSION}.tar.gz" | awk '{print $1}')"
|
|
||||||
|
|
||||||
if [[ -z "${SHA2}" ]]; then
|
|
||||||
echo "Failed to determine SHA2 for ${TAG_NAME}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
|
|
||||||
echo "SHA=${SHA}" >> $GITHUB_OUTPUT
|
|
||||||
echo "SHA2=${SHA2}" >> $GITHUB_OUTPUT
|
|
||||||
- name: MODIFY VERSION FILE
|
|
||||||
run: |
|
|
||||||
sudo npm install --global --silent @bazel/buildozer
|
|
||||||
|
|
||||||
OLD_SHA="$(cat MODULE.bazel | buildozer 'print sha256' -:${{ matrix.name }})"
|
|
||||||
OLD_VERSION="$(cat MODULE.bazel | buildozer 'print version' -:${{ matrix.name }})"
|
|
||||||
|
|
||||||
echo "OLD_SHA: $OLD_SHA"
|
|
||||||
echo "OLD_VERSION: $OLD_VERSION"
|
|
||||||
|
|
||||||
echo "$(cat MODULE.bazel | buildozer 'set sha256 "${{ steps.fetch-version.outputs.SHA }}"' -:${{ matrix.name }})" > MODULE.bazel
|
|
||||||
echo "$(cat MODULE.bazel | buildozer 'set version "${{ steps.fetch-version.outputs.VERSION }}"' -:${{ matrix.name }})" > MODULE.bazel
|
|
||||||
echo "MODULE.bazel updated"
|
|
||||||
|
|
||||||
echo "$(cat WORKSPACE | buildozer 'set downloaded_file_path "OTP-${{ steps.fetch-version.outputs.VERSION }}.tar.gz"' -:otp_src_${{ matrix.name }})" > WORKSPACE
|
|
||||||
echo "$(cat WORKSPACE | buildozer 'set urls ["https://github.com/erlang/otp/archive/OTP-${{ steps.fetch-version.outputs.VERSION }}.tar.gz"]' -:otp_src_${{ matrix.name }})" > WORKSPACE
|
|
||||||
echo "$(cat WORKSPACE | buildozer 'set sha256 "${{ steps.fetch-version.outputs.SHA2 }}"' -:otp_src_${{ matrix.name }})" > WORKSPACE
|
|
||||||
|
|
||||||
echo "WORKSPACE updated"
|
|
||||||
|
|
||||||
set -x
|
|
||||||
git diff
|
|
||||||
- name: CREATE PULL REQUEST
|
|
||||||
uses: peter-evans/create-pull-request@v6.0.0
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.REPO_SCOPED_TOKEN }}
|
|
||||||
committer: GitHub <noreply@github.com>
|
|
||||||
author: GitHub <noreply@github.com>
|
|
||||||
title: Adopt otp ${{ steps.fetch-version.outputs.VERSION }}
|
|
||||||
body: >
|
|
||||||
Automated changes created by
|
|
||||||
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
|
||||||
using the [create-pull-request](https://github.com/peter-evans/create-pull-request)
|
|
||||||
GitHub action in the ${{ github.workflow }} workflow.
|
|
||||||
commit-message: |
|
|
||||||
Adopt otp ${{ steps.fetch-version.outputs.VERSION }}
|
|
||||||
labels: ${{ matrix.labels }}
|
|
||||||
branch: ${{ env.branch }}
|
|
||||||
delete-branch: true
|
|
||||||
60
MODULE.bazel
60
MODULE.bazel
|
|
@ -67,66 +67,6 @@ erlang_config = use_extension(
|
||||||
"erlang_config",
|
"erlang_config",
|
||||||
)
|
)
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "24",
|
|
||||||
sha256 = "8444ff9abe23aea268adbb95463561fc222c965052d35d7c950b17be01c3ad82",
|
|
||||||
version = "24.3.4.6",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "25_0",
|
|
||||||
sha256 = "8fc707f92a124b2aeb0f65dcf9ac8e27b2a305e7bcc4cc1b2fdf770eec0165bf",
|
|
||||||
version = "25.0.4",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "25_1",
|
|
||||||
sha256 = "1cd2fbe225a412009cda9b1fd9f3fff0293e75e3020daa48abf68721471e91eb",
|
|
||||||
version = "25.1.2.1",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "25_2",
|
|
||||||
sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
|
|
||||||
version = "25.2.3",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "25_3",
|
|
||||||
sha256 = "0a7338415c8eb6ae25664bfd1a10631c293838ef072665223a524831b823a8b7",
|
|
||||||
version = "25.3.2.10",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "26_1",
|
|
||||||
sha256 = "f1074cf3a54f1f87e66027d5abebab2fa76a0243453fa58bc5f30d0ce0313921",
|
|
||||||
version = "26.1.2",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_github_release(
|
|
||||||
name = "26_2",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
sha256 = "de155c4ad9baab2b9e6c96dbd03bf955575a04dd6feee9c08758beb28484c9f6",
|
|
||||||
version = "26.2.5",
|
|
||||||
)
|
|
||||||
|
|
||||||
erlang_config.internal_erlang_from_http_archive(
|
|
||||||
name = "git_master",
|
|
||||||
strip_prefix = "otp-master",
|
|
||||||
url = "https://github.com/erlang/otp/archive/refs/heads/master.tar.gz",
|
|
||||||
version = "27",
|
|
||||||
extra_make_opts = ["-j 4"],
|
|
||||||
)
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> a6874e39cc (Turn off BuildBuddy integration (#11343))
|
|
||||||
use_repo(
|
use_repo(
|
||||||
erlang_config,
|
erlang_config,
|
||||||
"erlang_config",
|
"erlang_config",
|
||||||
|
|
|
||||||
52
WORKSPACE
52
WORKSPACE
|
|
@ -34,58 +34,6 @@ load("@rules_erlang//gazelle:deps.bzl", "gazelle_deps")
|
||||||
|
|
||||||
gazelle_deps()
|
gazelle_deps()
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_24",
|
|
||||||
downloaded_file_path = "OTP-24.3.4.6.tar.gz",
|
|
||||||
sha256 = "dc3d2c54eeb093e0dc9a0fe493bc69d6dfac0affbe77c9e3c935aa86c0f63cd5",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-24.3.4.6.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_25_0",
|
|
||||||
downloaded_file_path = "OTP-25.0.4.tar.gz",
|
|
||||||
sha256 = "05878cb51a64b33c86836b12a21903075c300409b609ad5e941ddb0feb8c2120",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-25.0.4.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_25_1",
|
|
||||||
downloaded_file_path = "OTP-25.1.2.1.tar.gz",
|
|
||||||
sha256 = "79f8e31bb9ff7d43a920f207ef104d1106b2332fdbadf11241d714eacb6d8d1a",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-25.1.2.1.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_25_2",
|
|
||||||
downloaded_file_path = "OTP-25.2.3.tar.gz",
|
|
||||||
sha256 = "637bc5cf68dd229fd3c3fe889a6f84dd32c4a827488550a0a98123b00c2d78b5",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-25.2.3.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_25_3",
|
|
||||||
downloaded_file_path = "OTP-25.3.2.10.tar.gz",
|
|
||||||
sha256 = "be76f05bd38c60df056ed35f01085f088474a1942ce1778c2217e5658d435b35",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-25.3.2.10.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_26_1",
|
|
||||||
downloaded_file_path = "OTP-26.1.2.tar.gz",
|
|
||||||
sha256 = "56042d53b30863d4e720ebf463d777f0502f8c986957fc3a9e63dae870bbafe0",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-26.1.2.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
http_file(
|
|
||||||
name = "otp_src_26_2",
|
|
||||||
downloaded_file_path = "OTP-26.2.5.tar.gz",
|
|
||||||
sha256 = "d34b409cb5968ae47dd5a0c4f85b925d5601898d90788bbb08d514964a3a141d",
|
|
||||||
urls = ["https://github.com/erlang/otp/archive/OTP-26.2.5.tar.gz"],
|
|
||||||
)
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> a6874e39cc (Turn off BuildBuddy integration (#11343))
|
|
||||||
new_git_repository(
|
new_git_repository(
|
||||||
name = "bats",
|
name = "bats",
|
||||||
build_file = "@//:BUILD.bats",
|
build_file = "@//:BUILD.bats",
|
||||||
|
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
log_level = "DEBUG"
|
|
||||||
enable_syslog = false
|
|
||||||
enable_script_checks = false
|
|
||||||
enable_local_script_checks = true
|
|
||||||
|
|
||||||
datacenter = "dc1"
|
|
||||||
server = true
|
|
||||||
bootstrap_expect = 1
|
|
||||||
|
|
||||||
## ACL configuration
|
|
||||||
acl = {
|
|
||||||
enabled = true
|
|
||||||
default_policy = "allow"
|
|
||||||
enable_token_persistence = true
|
|
||||||
enable_token_replication = true
|
|
||||||
down_policy = "extend-cache"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Enable service mesh
|
|
||||||
connect {
|
|
||||||
enabled = true
|
|
||||||
}
|
|
||||||
|
|
||||||
# Addresses and ports
|
|
||||||
client_addr = "0.0.0.0"
|
|
||||||
bind_addr = "{{ GetInterfaceIP \"eth0\" }}"
|
|
||||||
|
|
||||||
addresses {
|
|
||||||
grpc = "0.0.0.0"
|
|
||||||
http = "0.0.0.0"
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue