Skip to content

Commit 6a32def

Browse files
author
Pearl Dsilva
committed
Merge branch 'main' of https://github.com/apache/cloudstack into clvm-enhancements
2 parents ebe8fa0 + 6bc83a3 commit 6a32def

412 files changed

Lines changed: 38654 additions & 2903 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.asf.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ github:
5555
- erikbocks
5656
- Imvedansh
5757
- Damans227
58+
- jmsperu
59+
- GaOrtiga
5860

5961
protected_branches: ~
6062

‎.github/actions/install-nonoss/action.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: 'Install CloudStack Non-OSS'
19+
description: 'Clones and installs the shapeblue/cloudstack-nonoss repository.'
20+
21+
runs:
22+
using: "composite"
23+
steps:
24+
- name: Install cloudstack-nonoss
25+
shell: bash
26+
run: |
27+
git clone --depth 1 https://github.com/shapeblue/cloudstack-nonoss.git nonoss
28+
cd nonoss
29+
bash -x install-non-oss.sh
30+
cd ..
31+
rm -fr nonoss

‎.github/actions/setup-env/action.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: 'Setup CloudStack Environment'
19+
description: 'Sets up JDK (with Maven cache), optionally Python, and optionally APT build dependencies for CloudStack.'
20+
21+
inputs:
22+
java-version:
23+
description: 'The JDK version to use'
24+
required: false
25+
default: '17'
26+
install-python:
27+
description: 'Whether to install Python 3.10'
28+
required: false
29+
default: 'false'
30+
install-apt-deps:
31+
description: 'Whether to install CloudStack APT build dependencies'
32+
required: false
33+
default: 'false'
34+
35+
runs:
36+
using: "composite"
37+
steps:
38+
- name: Set up JDK ${{ inputs.java-version }}
39+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
40+
with:
41+
java-version: ${{ inputs.java-version }}
42+
distribution: 'adopt'
43+
architecture: x64
44+
cache: 'maven'
45+
46+
- name: Set up Python
47+
if: ${{ inputs.install-python == 'true' }}
48+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
49+
with:
50+
python-version: '3.10'
51+
architecture: x64
52+
53+
- name: Install Build Dependencies
54+
if: ${{ inputs.install-apt-deps == 'true' }}
55+
shell: bash
56+
run: |
57+
sudo apt-get update
58+
sudo apt-get install -y git uuid-runtime genisoimage netcat-openbsd ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools

‎.github/aw/actions-lock.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"entries": {
3+
"actions/github-script@v9.0.0": {
4+
"repo": "actions/github-script",
5+
"version": "v9.0.0",
6+
"sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
7+
},
8+
"github/gh-aw-actions/setup@v0.76.1": {
9+
"repo": "github/gh-aw-actions/setup",
10+
"version": "v0.76.1",
11+
"sha": "46d564922b082d0db93244972e8005ea6904ee5f"
12+
}
13+
},
14+
"containers": {
15+
"ghcr.io/github/gh-aw-firewall/agent:0.18.0": {
16+
"image": "ghcr.io/github/gh-aw-firewall/agent:0.18.0",
17+
"digest": "sha256:ab84dfc7f5998cb8cd0c596526dd573b7e7d06c6a740266a1e6df879fa16c866",
18+
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.18.0@sha256:ab84dfc7f5998cb8cd0c596526dd573b7e7d06c6a740266a1e6df879fa16c866"
19+
},
20+
"ghcr.io/github/gh-aw-firewall/agent:0.25.55": {
21+
"image": "ghcr.io/github/gh-aw-firewall/agent:0.25.55",
22+
"digest": "sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731",
23+
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731"
24+
},
25+
"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55": {
26+
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55",
27+
"digest": "sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3",
28+
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55@sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3"
29+
},
30+
"ghcr.io/github/gh-aw-firewall/squid:0.18.0": {
31+
"image": "ghcr.io/github/gh-aw-firewall/squid:0.18.0",
32+
"digest": "sha256:82a5d062a5612a57a43a171a5b79ddbb690a86a8ddda02339cc1675131ae9f8b",
33+
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.18.0@sha256:82a5d062a5612a57a43a171a5b79ddbb690a86a8ddda02339cc1675131ae9f8b"
34+
},
35+
"ghcr.io/github/gh-aw-firewall/squid:0.25.55": {
36+
"image": "ghcr.io/github/gh-aw-firewall/squid:0.25.55",
37+
"digest": "sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca",
38+
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.25.55@sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca"
39+
},
40+
"ghcr.io/github/gh-aw-mcpg:v0.1.4": {
41+
"image": "ghcr.io/github/gh-aw-mcpg:v0.1.4",
42+
"digest": "sha256:0acf25aa1d409f9c73be9e39ac84f4bd4b90d8bfa1db4dc6d7f47d38ccd58914",
43+
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.1.4@sha256:0acf25aa1d409f9c73be9e39ac84f4bd4b90d8bfa1db4dc6d7f47d38ccd58914"
44+
},
45+
"ghcr.io/github/gh-aw-mcpg:v0.3.19": {
46+
"image": "ghcr.io/github/gh-aw-mcpg:v0.3.19",
47+
"digest": "sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f",
48+
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.3.19@sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f"
49+
},
50+
"ghcr.io/github/github-mcp-server:v0.30.3": {
51+
"image": "ghcr.io/github/github-mcp-server:v0.30.3",
52+
"digest": "sha256:a2b5fb79b1cee851bfc3532dfe480c3dc5736974ca9d93a7a9f68e52ce4b62a0",
53+
"pinned_image": "ghcr.io/github/github-mcp-server:v0.30.3@sha256:a2b5fb79b1cee851bfc3532dfe480c3dc5736974ca9d93a7a9f68e52ce4b62a0"
54+
}
55+
}
56+
}

‎.github/aw/imports/github/gh-aw/359795d49ada21681ab616bd4cbcb144a7387115/.github_workflows_shared_reporting.md‎

Lines changed: 73 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/dependabot.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ updates:
3131
github-actions-dependencies:
3232
patterns:
3333
- "*"
34+
ignore:
35+
- dependency-name: "github/gh-aw-actions/**" # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
3436
cooldown:
3537
default-days: 7
3638
- package-ecosystem: "maven"

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,27 @@
1616
# under the License.
1717

1818
name: Build
19-
20-
on: [push, pull_request]
21-
19+
on:
20+
- push
21+
- pull_request
2222
concurrency:
2323
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
24-
cancel-in-progress: true
25-
24+
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
2625
permissions:
2726
contents: read
28-
2927
jobs:
3028
build:
31-
runs-on: ubuntu-22.04
29+
runs-on: ubuntu-24.04
3230
steps:
33-
- uses: actions/checkout@v6
34-
35-
- name: Set up JDK 17
36-
uses: actions/setup-java@v5
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3732
with:
38-
distribution: 'temurin'
39-
java-version: '17'
40-
cache: 'maven'
33+
persist-credentials: false
4134

42-
- name: Set up Python
43-
uses: actions/setup-python@v6
35+
- name: Setup Environment
36+
uses: ./.github/actions/setup-env
4437
with:
45-
python-version: '3.10'
46-
architecture: 'x64'
47-
48-
- name: Install Build Dependencies
49-
run: |
50-
sudo apt-get update
51-
sudo apt-get install -y git uuid-runtime genisoimage netcat ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
52-
38+
install-python: 'true'
39+
install-apt-deps: 'true'
5340
- name: Env details
5441
run: |
5542
uname -a
@@ -60,9 +47,8 @@ jobs:
6047
free -m
6148
nproc
6249
git status
63-
50+
- name: Install Non-OSS
51+
uses: ./.github/actions/install-nonoss
6452
- name: Noredist Build
6553
run: |
66-
git clone https://github.com/shapeblue/cloudstack-nonoss.git nonoss && cd nonoss && bash -x install-non-oss.sh && cd ..
67-
rm -fr nonoss
6854
mvn -B -P developer,systemvm -Dsimulator -Dnoredist clean install -T$(nproc)

0 commit comments

Comments
 (0)