Skip to content

Commit a46a698

Browse files
committed
Merge remote-tracking branch 'origin/main' into ssncferreira/feat-ui-preset-icon-description
2 parents c4444ec + 415273f commit a46a698

File tree

4 files changed

+28
-0
lines changed

4 files changed

+28
-0
lines changed

.github/workflows/ci.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,27 @@ jobs:
10601060
- name: Setup Go
10611061
uses: ./.github/actions/setup-go
10621062

1063+
- name: Install rcodesign
1064+
run: |
1065+
set -euo pipefail
1066+
wget -O /tmp/rcodesign.tar.gz https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.22.0/apple-codesign-0.22.0-x86_64-unknown-linux-musl.tar.gz
1067+
sudo tar -xzf /tmp/rcodesign.tar.gz \
1068+
-C /usr/bin \
1069+
--strip-components=1 \
1070+
apple-codesign-0.22.0-x86_64-unknown-linux-musl/rcodesign
1071+
rm /tmp/rcodesign.tar.gz
1072+
1073+
- name: Setup Apple Developer certificate
1074+
run: |
1075+
set -euo pipefail
1076+
touch /tmp/{apple_cert.p12,apple_cert_password.txt}
1077+
chmod 600 /tmp/{apple_cert.p12,apple_cert_password.txt}
1078+
echo "$AC_CERTIFICATE_P12_BASE64" | base64 -d > /tmp/apple_cert.p12
1079+
echo "$AC_CERTIFICATE_PASSWORD" > /tmp/apple_cert_password.txt
1080+
env:
1081+
AC_CERTIFICATE_P12_BASE64: ${{ secrets.AC_CERTIFICATE_P12_BASE64 }}
1082+
AC_CERTIFICATE_PASSWORD: ${{ secrets.AC_CERTIFICATE_PASSWORD }}
1083+
10631084
# Necessary for signing Windows binaries.
10641085
- name: Setup Java
10651086
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
@@ -1138,6 +1159,9 @@ jobs:
11381159
CODER_WINDOWS_RESOURCES: "1"
11391160
CODER_SIGN_GPG: "1"
11401161
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.GPG_RELEASE_KEY_BASE64 }}
1162+
CODER_SIGN_DARWIN: "1"
1163+
AC_CERTIFICATE_FILE: /tmp/apple_cert.p12
1164+
AC_CERTIFICATE_PASSWORD_FILE: /tmp/apple_cert_password.txt
11411165
EV_KEY: ${{ secrets.EV_KEY }}
11421166
EV_KEYSTORE: ${{ secrets.EV_KEYSTORE }}
11431167
EV_TSA_URL: ${{ secrets.EV_TSA_URL }}

site/src/theme/icons.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"folder.svg",
4949
"gateway.svg",
5050
"gcp.png",
51+
"gemini.svg",
5152
"git.svg",
5253
"gitea.svg",
5354
"github.svg",
@@ -104,6 +105,7 @@
104105
"tensorflow.svg",
105106
"terminal.svg",
106107
"theia.svg",
108+
"tmux.svg",
107109
"typescript.svg",
108110
"ubuntu.svg",
109111
"vault.svg",

site/static/icon/gemini.svg

Lines changed: 1 addition & 0 deletions
Loading

site/static/icon/tmux.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)