Skip to content

Commit f8ee090

Browse files
GPTI314GPTI314
authored
Merge branch 'main' into claude/fix-visibility-settings-01Y7udrmas2MoG9dp5gJAu1L
2 parents e361933 + 3ea5169 commit f8ee090

15 files changed

+727
-1051
lines changed

‎.circleci/config.yml‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,15 @@ workflows:
554554
context: slack-cli-release
555555
release_ref: dev-build
556556
- e2e-test:
557+
name: e2e-test-unix
558+
manual_trigger_windows: false
559+
requires:
560+
- create-github-release-and-artifacts
561+
context: slack-cli-e2e
562+
release_ref: dev-build
563+
- e2e-test:
564+
name: e2e-test-windows
565+
manual_trigger_windows: true
557566
requires:
558567
- create-github-release-and-artifacts
559568
context: slack-cli-e2e
@@ -580,6 +589,15 @@ workflows:
580589
context: slack-cli-release
581590
release_ref: dev-build
582591
- e2e-test:
592+
name: e2e-test-unix
593+
manual_trigger_windows: false
594+
requires:
595+
- create-github-release-and-artifacts
596+
context: slack-cli-e2e
597+
release_ref: dev-build
598+
- e2e-test:
599+
name: e2e-test-windows
600+
manual_trigger_windows: true
583601
requires:
584602
- create-github-release-and-artifacts
585603
context: slack-cli-e2e
@@ -695,34 +713,3 @@ workflows:
695713
requires:
696714
- create-github-release-and-artifacts
697715
context: slack-cli-release
698-
699-
# production tests are run separate from deployment to avoid errors with tags.
700-
prod-build-test-e2e-test:
701-
when:
702-
matches:
703-
pattern: "^v(\\d+\\.)?(\\d+\\.)?(\\d+)$"
704-
value: << pipeline.git.tag >>
705-
jobs:
706-
- build:
707-
<<: *filters-tag-triggered-workflow-job
708-
context: slack-cli-release
709-
release_ref: << pipeline.git.tag >>
710-
- create-github-release-and-artifacts:
711-
requires:
712-
- build
713-
context: slack-cli-release
714-
release_ref: << pipeline.git.branch >>
715-
- e2e-test:
716-
name: e2e-test-unix
717-
e2e_target_branch: "main"
718-
manual_trigger_windows: false
719-
requires:
720-
- create-github-release-and-artifacts
721-
context: slack-cli-e2e
722-
- e2e-test:
723-
name: e2e-test-windows
724-
e2e_target_branch: "main"
725-
manual_trigger_windows: true
726-
requires:
727-
- create-github-release-and-artifacts
728-
context: slack-cli-e2e

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Salesforce Open Source configuration
2+
#ECCN:Open Source
3+
#GUSINFO:Open Source,Open Source Workflow
4+
15
# * @slackapi/slack-cli-team will be added as code reviewers
26
# to all files in this repo.
37
* @slackapi/slack-cli-team

‎.github/workflows/dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
fi
8484
git commit --all -m "build(deps): bump golang to ${VERSION#go}"
8585
git push -u origin chore-bump-golang
86-
gh pr create --title "build(deps): bump golang to ${VERSION#go}" --body "Automatic update to the latest release of Go" --milestone "Next Release" --label "code health"
86+
gh pr create --title "build(deps): bump golang to ${VERSION#go}" --body "Automatic update to the latest release of Go" --milestone "Next Release" --label "code health" --label "semver:patch"
8787
env:
8888
GITHUB_TOKEN: ${{ steps.credentials.outputs.token }}
8989
VERSION: ${{ steps.version.outputs.latest }}

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
go-version: "1.25.3"
2929
- name: Lint
30-
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
30+
uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9.0.0
3131
with:
3232
version: latest
3333
args: --timeout=5m

‎docs/guides/installing-the-slack-cli-for-mac-and-linux.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ Manual installation allows you to customize certain paths used when installing t
9999

100100
**2\. Download the** `slack` **CLI installer for your environment.**
101101

102-
🍎 ⚡️ [**Download for macOS Apple Silicon (.tar.gz)**](https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.1_macOS_arm64.tar.gz)
102+
🍎 ⚡️ [**Download for macOS Apple Silicon (.tar.gz)**](https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.2_macOS_arm64.tar.gz)
103103

104-
🍏 🪨 [**Download for macOS Intel (.tar.gz)**](https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.1_macOS_amd64.tar.gz)
104+
🍏 🪨 [**Download for macOS Intel (.tar.gz)**](https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.2_macOS_amd64.tar.gz)
105105

106-
🐧 💾 [**Download for Linux (.tar.gz)**](https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.1_linux_64-bit.tar.gz)
106+
🐧 💾 [**Download for Linux (.tar.gz)**](https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.2_linux_64-bit.tar.gz)
107107

108108
**3\. Add the** `slack` **CLI to your path.**
109109

@@ -121,7 +121,7 @@ We recommend using an alias if another `slack` binary exists. To do this, change
121121

122122
```sh
123123
$ slack version
124-
Using slack v3.9.1
124+
Using slack v3.9.2
125125
```
126126

127127
</TabItem>

‎docs/guides/installing-the-slack-cli-for-windows.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Manual installation allows you to customize certain paths used when installing t
8888

8989
**2\. Download the** `slack` **CLI installer for your environment.**
9090

91-
<ts-icon class="ts_icon_windows"></ts-icon> &nbsp; <a href="https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.1_windows_64-bit.zip"><strong>Windows (.zip)</strong></a>
91+
<ts-icon class="ts_icon_windows"></ts-icon> &nbsp; <a href="https://downloads.slack-edge.com/slack-cli/slack_cli_3.9.2_windows_64-bit.zip"><strong>Windows (.zip)</strong></a>
9292

9393
**3\. Add the** `slack` **CLI to your path.**
9494

@@ -104,7 +104,7 @@ We recommend using an alias if another `slack` binary exists. To do this, change
104104

105105
```pwsh
106106
$ slack version
107-
Using slack v3.9.1
107+
Using slack v3.9.2
108108
```
109109

110110
</TabItem>

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ require (
2323
github.com/spf13/cobra v1.10.1
2424
github.com/stretchr/testify v1.11.1
2525
github.com/uber/jaeger-client-go v2.30.0+incompatible
26-
golang.org/x/mod v0.29.0
27-
golang.org/x/sys v0.37.0
28-
golang.org/x/text v0.30.0
26+
golang.org/x/mod v0.30.0
27+
golang.org/x/sys v0.38.0
28+
golang.org/x/text v0.31.0
2929
gopkg.in/yaml.v2 v2.4.0
3030
)
3131

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+o
180180
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
181181
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
182182
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
183-
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
184-
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
183+
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
184+
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
185185
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
186186
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
187187
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -205,8 +205,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
205205
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
206206
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
207207
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
208-
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
209-
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
208+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
209+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
210210
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
211211
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
212212
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
@@ -216,8 +216,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
216216
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
217217
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
218218
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
219-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
220-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
219+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
220+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
221221
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
222222
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
223223
golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)