Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7527853

Browse files
committed
Merge branch 'main' ofhttps://github.com/coder/coder into bq/preload-inter-font
2 parents38f9406 +54440af commit7527853

File tree

50 files changed

+754
-294
lines changed

Some content is hidden

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

50 files changed

+754
-294
lines changed

‎.github/actions/embedded-pg-cache/download/action.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ runs:
2525
export YEAR_MONTH=$(date +'%Y-%m')
2626
export PREV_YEAR_MONTH=$(date -d 'last month' +'%Y-%m')
2727
export DAY=$(date +'%d')
28-
echo "year-month=$YEAR_MONTH" >> $GITHUB_OUTPUT
29-
echo "prev-year-month=$PREV_YEAR_MONTH" >> $GITHUB_OUTPUT
30-
echo "cache-key=${{ inputs.key-prefix }}-${YEAR_MONTH}-${DAY}" >> $GITHUB_OUTPUT
28+
echo "year-month=$YEAR_MONTH" >> "$GITHUB_OUTPUT"
29+
echo "prev-year-month=$PREV_YEAR_MONTH" >> "$GITHUB_OUTPUT"
30+
echo "cache-key=${INPUTS_KEY_PREFIX}-${YEAR_MONTH}-${DAY}" >> "$GITHUB_OUTPUT"
31+
env:
32+
INPUTS_KEY_PREFIX:${{ inputs.key-prefix }}
3133

3234
# By default, depot keeps caches for 14 days. This is plenty for embedded
3335
# postgres, which changes infrequently.

‎.github/actions/test-cache/download/action.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ runs:
2727
export YEAR_MONTH=$(date +'%Y-%m')
2828
export PREV_YEAR_MONTH=$(date -d 'last month' +'%Y-%m')
2929
export DAY=$(date +'%d')
30-
echo "year-month=$YEAR_MONTH" >> $GITHUB_OUTPUT
31-
echo "prev-year-month=$PREV_YEAR_MONTH" >> $GITHUB_OUTPUT
32-
echo "cache-key=${{ inputs.key-prefix }}-${YEAR_MONTH}-${DAY}" >> $GITHUB_OUTPUT
30+
echo "year-month=$YEAR_MONTH" >> "$GITHUB_OUTPUT"
31+
echo "prev-year-month=$PREV_YEAR_MONTH" >> "$GITHUB_OUTPUT"
32+
echo "cache-key=${INPUTS_KEY_PREFIX}-${YEAR_MONTH}-${DAY}" >> "$GITHUB_OUTPUT"
33+
env:
34+
INPUTS_KEY_PREFIX:${{ inputs.key-prefix }}
3335

3436
# TODO: As a cost optimization, we could remove caches that are older than
3537
# a day or two. By default, depot keeps caches for 14 days, which isn't

‎.github/actions/upload-datadog/action.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ runs:
1212
run:|
1313
set -e
1414
15-
owner=${{ github.repository_owner }}
16-
echo "owner: $owner"
17-
if [[ $owner != "coder" ]]; then
15+
echo "owner: $REPO_OWNER"
16+
if [[ "$REPO_OWNER" != "coder" ]]; then
1817
echo "Not a pull request from the main repo, skipping..."
1918
exit 0
2019
fi
21-
if [[ -z "${{ inputs.api-key }}" ]]; then
20+
if [[ -z "${DATADOG_API_KEY}" ]]; then
2221
# This can happen for dependabot.
2322
echo "No API key provided, skipping..."
2423
exit 0
@@ -31,37 +30,38 @@ runs:
3130
3231
TMP_DIR=$(mktemp -d)
3332
34-
if [[ "${{ runner.os }}" == "Windows" ]]; then
33+
if [[ "${RUNNER_OS}" == "Windows" ]]; then
3534
BINARY_PATH="${TMP_DIR}/datadog-ci.exe"
3635
BINARY_URL="https://github.com/DataDog/datadog-ci/releases/download/${BINARY_VERSION}/datadog-ci_win-x64"
37-
elif [[ "${{ runner.os }}" == "macOS" ]]; then
36+
elif [[ "${RUNNER_OS}" == "macOS" ]]; then
3837
BINARY_PATH="${TMP_DIR}/datadog-ci"
3938
BINARY_URL="https://github.com/DataDog/datadog-ci/releases/download/${BINARY_VERSION}/datadog-ci_darwin-arm64"
40-
elif [[ "${{ runner.os }}" == "Linux" ]]; then
39+
elif [[ "${RUNNER_OS}" == "Linux" ]]; then
4140
BINARY_PATH="${TMP_DIR}/datadog-ci"
4241
BINARY_URL="https://github.com/DataDog/datadog-ci/releases/download/${BINARY_VERSION}/datadog-ci_linux-x64"
4342
else
44-
echo "Unsupported OS: ${{ runner.os }}"
43+
echo "Unsupported OS: $RUNNER_OS"
4544
exit 1
4645
fi
4746
48-
echo "Downloading DataDog CI binary version ${BINARY_VERSION} for ${{ runner.os }}..."
47+
echo "Downloading DataDog CI binary version ${BINARY_VERSION} for $RUNNER_OS..."
4948
curl -sSL "$BINARY_URL" -o "$BINARY_PATH"
5049
51-
if [[ "${{ runner.os }}" == "Windows" ]]; then
50+
if [[ "${RUNNER_OS}" == "Windows" ]]; then
5251
echo "$BINARY_HASH_WINDOWS $BINARY_PATH" | sha256sum --check
53-
elif [[ "${{ runner.os }}" == "macOS" ]]; then
52+
elif [[ "${RUNNER_OS}" == "macOS" ]]; then
5453
echo "$BINARY_HASH_MACOS $BINARY_PATH" | shasum -a 256 --check
55-
elif [[ "${{ runner.os }}" == "Linux" ]]; then
54+
elif [[ "${RUNNER_OS}" == "Linux" ]]; then
5655
echo "$BINARY_HASH_LINUX $BINARY_PATH" | sha256sum --check
5756
fi
5857
5958
# Make binary executable (not needed for Windows)
60-
if [[ "${{ runner.os }}" != "Windows" ]]; then
59+
if [[ "${RUNNER_OS}" != "Windows" ]]; then
6160
chmod +x "$BINARY_PATH"
6261
fi
6362
6463
"$BINARY_PATH" junit upload --service coder ./gotests.xml \
65-
--tags os:${{runner.os}} --tags runner_name:${{runner.name}}
64+
--tags"os:${RUNNER_OS}" --tags"runner_name:${RUNNER_NAME}"
6665
env:
66+
REPO_OWNER:${{ github.repository_owner }}
6767
DATADOG_API_KEY:${{ inputs.api-key }}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp