Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
totoro642 committed Jan 14, 2025
1 parent b0520fe commit 89b3de0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 65 deletions.
64 changes: 2 additions & 62 deletions build-matrix.json
Original file line number Diff line number Diff line change
@@ -1,77 +1,17 @@
{
"comment1": "runners hosted by GitHub, always enabled",
"hosted": [
{
"comment": "Alpine container for static Linux binaries",
"os": "ubuntu-latest",
"container": "alpine:3.20",
"os_name": "linux",
"target_arch": "x64",
"exe_ext": ""
},
{
"comment": "Ubuntu 24.04 with hardware acceleration",
"os": "ubuntu-latest",
"os": "self-hosted-selenium",
"container": "ubuntu:24.04",
"os_name": "linux",
"target_arch": "x64",
"exe_ext": "-ubuntu-24.04"
},
{
"comment": "Ubuntu 22.04 with hardware acceleration",
"os": "ubuntu-latest",
"container": "ubuntu:22.04",
"os_name": "linux",
"target_arch": "x64",
"exe_ext": "-ubuntu-22.04"
},
{
"comment": "Explicit macOS version 13 is required for explicit x64 CPU.",
"os": "macos-13",
"os_name": "osx",
"target_arch": "x64",
"exe_ext": ""
},
{
"comment": "Latest macOS version is arm64 CPU.",
"os": "macos-latest",
"os_name": "osx",
"target_arch": "arm64",
"exe_ext": ""
},
{
"os": "windows-latest",
"os_name": "win",
"target_arch": "x64",
"exe_ext": ".exe"
"exe_ext": "-ubuntu-24.04"
}
],

"comment2": "runners hosted by the owner, enabled by the ENABLE_SELF_HOSTED variable being set on the repo",
"selfHosted": [
{
"comment": "Alpine container for static Linux binaries",
"os": "self-hosted-linux-arm64",
"container": "alpine:3.20",
"os_name": "linux",
"target_arch": "arm64",
"exe_ext": ""
},
{
"comment": "Ubuntu 24.04 with hardware acceleration",
"os": "self-hosted-linux-arm64",
"container": "ubuntu:24.04",
"os_name": "linux",
"target_arch": "arm64",
"exe_ext": "-ubuntu-24.04"
},
{
"comment": "Ubuntu 22.04 with hardware acceleration",
"os": "self-hosted-linux-arm64",
"container": "ubuntu:22.04",
"os_name": "linux",
"target_arch": "arm64",
"exe_ext": "-ubuntu-22.04"
}
]
}
8 changes: 5 additions & 3 deletions build-scripts/00-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

set -e
set -x

if [[ "$RUNNER_OS" == "Linux" ]]; then
# Install missing packages on Linux.
#
Expand Down Expand Up @@ -63,6 +60,9 @@ if [[ "$RUNNER_OS" == "Linux" ]]; then

# Use sudo in install commands on Linux.
echo "SUDO=sudo" >> "$GITHUB_ENV"

curl --unix-socket /host/var/run/docker.sock http://localhost/version

elif [[ "$RUNNER_OS" == "macOS" ]]; then
# Use homebrew to install missing packages on mac.
brew install \
Expand Down Expand Up @@ -129,3 +129,5 @@ elif [[ "$RUNNER_OS" == "Windows" ]]; then
# Make sure that pkg-config searches the path where we will install things.
echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig" >> "$GITHUB_ENV"
fi

exit 0

0 comments on commit 89b3de0

Please sign in to comment.