Skip to content

Commit 659ab44

Browse files
authored
unixPB: remove xcode 11.7 installation (adoptium#4200)
1 parent da50947 commit 659ab44

File tree

6 files changed

+5
-76
lines changed

6 files changed

+5
-76
lines changed

.github/workflows/build_mac.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
include:
21-
- os: [macos-13]
22-
- os: [macos-14]
23-
- os: [macos-15]
20+
os: [macos-14, macos-15, macos-26]
2421
fail-fast: false
2522
steps:
2623

ansible/packer/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This repository contains two Packer configuration files used for building virtua
1212

1313
- [Packer](https://www.packer.io/downloads) installed on your system.
1414
- Access to a MacStadium Orka environment (via VPN).
15-
- Required environment variables set (`ORKA_TOKEN`, `XCode11_7_SAS_TOKEN`, `XCode15_2_SAS_TOKEN`).
15+
- Required environment variables set (`ORKA_TOKEN`, `XCode15_2_SAS_TOKEN`).
1616

1717
## Setup and Usage
1818

@@ -22,7 +22,6 @@ Set the necessary environment variables:
2222

2323
```bash
2424
export ORKA_TOKEN="your-orka-token"
25-
export XCode11_7_SAS_TOKEN="your-xcode11.7-token"
2625
export XCode15_2_SAS_TOKEN="your-xcode15.2-token"
2726
```
2827

ansible/packer/orka-base.pkr.hcl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ variable "ORKA_ENDPOINT" {
1919
default = "http://10.221.188.20"
2020
}
2121

22-
variable "XCode11_7_SAS_TOKEN" {
23-
default = env("XCode11_7_SAS_TOKEN")
24-
}
25-
2622
variable "XCode15_2_SAS_TOKEN" {
2723
default = env("XCode15_2_SAS_TOKEN")
2824
}
@@ -115,9 +111,8 @@ EOF
115111
playbook_dir = "../playbooks/AdoptOpenJDK_Unix_Playbook"
116112
extra_arguments = [
117113
"--extra-vars", "ansible_user=admin",
118-
"--extra-vars", "XCode11_7_SAS_TOKEN=\"${var.XCode11_7_SAS_TOKEN}\"",
119114
"--extra-vars", "XCode15_2_SAS_TOKEN=\"${var.XCode15_2_SAS_TOKEN}\"",
120-
"--tags", "xcode11,xcode15"
115+
"--tags", "xcode15"
121116
]
122117
command = "source /Users/admin/.zprofile; ansible-playbook"
123118
}

ansible/packer/orka.pkr.hcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ build {
9090
}
9191

9292
# Run ansible playbook
93-
# xcode11 and 15 are skipped because they should run only in the orka-base.pkr.hcl stage
93+
# Xcode 15 are skipped because they should run only in the orka-base.pkr.hcl stage
9494
provisioner "ansible-local" {
9595
playbook_file = "../playbooks/AdoptOpenJDK_Unix_Playbook/main.yml"
9696
playbook_dir = "../playbooks/AdoptOpenJDK_Unix_Playbook"
9797
extra_arguments = [
9898
"--extra-vars", "ansible_user=admin",
99-
"--skip-tags=xcode11,xcode15,hostname,brew_upgrade,brew_cu,core_dumps,crontab,kernel_tuning,adoptopenjdk,jenkins,nagios,superuser,swap_file,jck_tools"
99+
"--skip-tags=xcode15,hostname,brew_upgrade,brew_cu,core_dumps,crontab,kernel_tuning,adoptopenjdk,jenkins,nagios,superuser,swap_file,jck_tools"
100100
]
101101
command = "source /Users/admin/.zprofile; ansible-playbook"
102102
}

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@
103103
when:
104104
- ansible_architecture == "riscv64"
105105
tags: [devkit]
106-
- role: Xcode11
107-
when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
108-
tags: [xcode11] # JDK 8
109106
- role: Xcode15
110107
when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
111108
tags: [xcode15] # JDK 17+

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode11/tasks/main.yml

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

0 commit comments

Comments
 (0)