Skip to content

Commit bc1d72b

Browse files
Kiwi-520Kiwi-520
committed
Resolve all merge conflicts and fix build issues (core packages fully working)
1 parent 7444e59 commit bc1d72b

File tree

96 files changed

+217
-747
lines changed

Some content is hidden

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

96 files changed

+217
-747
lines changed

‎.github/actions/publish-release/action.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,19 @@ inputs:
3636
description: 'The working directory to run the steps in.'
3737
required: false
3838
default: '.'
39-
<<<<<<< HEAD
40-
=======
4139
force-skip-tests:
4240
description: 'Skip tests and validation'
4341
required: false
4442
default: false
45-
>>>>>>> upstream/main
4643

4744
runs:
4845
using: 'composite'
4946
steps:
50-
<<<<<<< HEAD
5147
- name: '📝 Print Inputs'
5248
shell: 'bash'
5349
run: |
5450
echo "${{ toJSON(inputs) }}"
5551
56-
=======
57-
>>>>>>> upstream/main
5852
- name: '👤 Configure Git User'
5953
working-directory: '${{ inputs.working-directory }}'
6054
shell: 'bash'
@@ -117,11 +111,8 @@ runs:
117111
npm publish \
118112
--dry-run="${{ inputs.dry-run }}" \
119113
--workspace="@google/gemini-cli-core" \
120-
<<<<<<< HEAD
121114
--tag="${{ inputs.npm-tag }}"
122-
=======
123115
--no-tag
124-
>>>>>>> upstream/main
125116
126117
- name: '🔗 Install latest core package'
127118
working-directory: '${{ inputs.working-directory }}'
@@ -141,9 +132,7 @@ runs:
141132
npm publish \
142133
--dry-run="${{ inputs.dry-run }}" \
143134
--workspace="@google/gemini-cli" \
144-
<<<<<<< HEAD
145135
--tag="${{ inputs.npm-tag }}"
146-
=======
147136
--no-tag
148137
149138
- name: '🔬 Verify NPM release by version'
@@ -163,7 +152,6 @@ runs:
163152
dry-run: '${{ inputs.dry-run }}'
164153
wombat-token-core: '${{ inputs.wombat-token-core }}'
165154
wombat-token-cli: '${{ inputs.wombat-token-cli }}'
166-
>>>>>>> upstream/main
167155

168156
- name: '🎁 Bundle'
169157
working-directory: '${{ inputs.working-directory }}'
@@ -173,11 +161,8 @@ runs:
173161
174162
- name: '🎉 Create GitHub Release'
175163
working-directory: '${{ inputs.working-directory }}'
176-
<<<<<<< HEAD
177164
if: "${{ inputs.dry-run == 'false' && inputs.skip-github-release == 'false' }}"
178-
=======
179165
if: "${{ inputs.dry-run == 'false' && inputs.skip-github-release == 'false' && inputs.npm-tag != 'dev' }}"
180-
>>>>>>> upstream/main
181166
env:
182167
GITHUB_TOKEN: '${{ inputs.github-token }}'
183168
shell: 'bash'

‎.github/actions/run-tests/action.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ name: 'Run Tests'
22
description: 'Runs the preflight checks and integration tests.'
33

44
inputs:
5-
<<<<<<< HEAD
6-
force_skip_tests:
7-
description: 'Whether to force skip the tests.'
8-
required: false
9-
type: 'boolean'
10-
default: false
11-
=======
12-
>>>>>>> upstream/main
135
gemini_api_key:
146
description: 'The API key for running integration tests.'
157
required: true
@@ -22,20 +14,10 @@ runs:
2214
using: 'composite'
2315
steps:
2416
- name: 'Run Tests'
25-
<<<<<<< HEAD
26-
if: '${{ !inputs.force_skip_tests }}'
27-
=======
28-
>>>>>>> upstream/main
2917
env:
3018
GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
3119
working-directory: '${{ inputs.working-directory }}'
3220
run: |-
33-
<<<<<<< HEAD
34-
npm run build
35-
npm run test:ci
36-
npm run test:integration:sandbox:none
37-
npm run test:integration:sandbox:docker
38-
=======
3921
echo "::group::Build"
4022
npm run build
4123
echo "::endgroup::"
@@ -48,5 +30,4 @@ runs:
4830
echo "::group::Integration Tests (docker sandbox)"
4931
npm run test:integration:sandbox:docker
5032
echo "::endgroup::"
51-
>>>>>>> upstream/main
5233
shell: 'bash'

‎.github/workflows/release-change-tags.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
registry-url: 'https://wombat-dressing-room.appspot.com'
4747
scope: '@google'
4848

49-
<<<<<<< HEAD
5049
- name: 'Change tag for @google/gemini-cli-core'
5150
if: |-
5251
${{ github.event.inputs.dry-run == 'false' }}
@@ -68,7 +67,6 @@ jobs:
6867
${{ github.event.inputs.dry-run == 'true' }}
6968
run: |
7069
echo "Dry run: Would have added tag '${{ github.event.inputs.channel }}' to version '${{ github.event.inputs.version }}' for @google/gemini-cli and @google/gemini-cli-core."
71-
=======
7270
- name: 'Change tag'
7371
uses: './.github/actions/tag-npm-release'
7472
with:
@@ -77,4 +75,3 @@ jobs:
7775
dry-run: '${{ github.event.inputs.dry-run }}'
7876
wombat-token-core: '${{ secrets.WOMBAT_TOKEN_CORE }}'
7977
wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
80-
>>>>>>> upstream/main

‎.github/workflows/release-manual.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ on:
3939

4040
jobs:
4141
release:
42-
<<<<<<< HEAD
4342
runs-on: 'ubuntu-latest'
44-
=======
4543
runs-on: 'self-hosted'
46-
>>>>>>> upstream/main
4744
permissions:
4845
contents: 'write'
4946
packages: 'write'
@@ -52,11 +49,9 @@ jobs:
5249
- name: 'Checkout'
5350
uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
5451
with:
55-
<<<<<<< HEAD
5652
ref: '${{ github.event.inputs.ref }}'
5753
fetch-depth: 0
5854

59-
=======
6055
fetch-depth: 0
6156

6257
- name: 'Checkout Release Code'
@@ -69,53 +64,40 @@ jobs:
6964
- name: 'Debug Inputs'
7065
run: 'echo "${{ toJSON(inputs) }}"'
7166

72-
>>>>>>> upstream/main
7367
- name: 'Setup Node.js'
7468
uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
7569
with:
7670
node-version-file: '.nvmrc'
7771
cache: 'npm'
7872

7973
- name: 'Install Dependencies'
80-
<<<<<<< HEAD
81-
=======
8274
working-directory: './release'
83-
>>>>>>> upstream/main
8475
run: 'npm ci'
8576

8677
- name: 'Prepare Release Info'
8778
id: 'release_info'
88-
<<<<<<< HEAD
89-
=======
9079
working-directory: './release'
91-
>>>>>>> upstream/main
9280
run: |
9381
RELEASE_VERSION="${{ github.event.inputs.version }}"
9482
echo "RELEASE_VERSION=${RELEASE_VERSION#v}" >> "${GITHUB_OUTPUT}"
9583
echo "PREVIOUS_TAG=$(git describe --tags --abbrev=0)" >> "${GITHUB_OUTPUT}"
9684
9785
- name: 'Run Tests'
98-
<<<<<<< HEAD
9986
if: |-
10087
${{ github.event.inputs.force_skip_tests != true }}
10188
uses: './.github/actions/run-tests'
10289
with:
10390
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
104-
=======
10591
if: "${{github.event.inputs.force_skip_tests != 'true'}}"
10692
uses: './.github/actions/run-tests'
10793
with:
10894
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
10995
working-directory: './release'
110-
>>>>>>> upstream/main
11196

11297
- name: 'Publish Release'
11398
uses: './.github/actions/publish-release'
11499
with:
115-
<<<<<<< HEAD
116-
=======
117100
force-skip-tests: '${{ github.event.inputs.force_skip_tests }}'
118-
>>>>>>> upstream/main
119101
release-version: '${{ steps.release_info.outputs.RELEASE_VERSION }}'
120102
release-tag: '${{ github.event.inputs.version }}'
121103
npm-tag: '${{ github.event.inputs.npm_channel }}'
@@ -125,8 +107,6 @@ jobs:
125107
dry-run: '${{ github.event.inputs.dry_run }}'
126108
previous-tag: '${{ steps.release_info.outputs.PREVIOUS_TAG }}'
127109
skip-github-release: '${{ github.event.inputs.skip_github_release }}'
128-
<<<<<<< HEAD
129-
=======
130110
working-directory: './release'
131111

132112
- name: 'Create Issue on Failure'
@@ -140,4 +120,3 @@ jobs:
140120
--title 'Manual Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
141121
--body 'The manual release workflow failed. See the full run for details: ${DETAILS_URL}' \
142122
--label 'kind/bug,release-failure,priority/p0'
143-
>>>>>>> upstream/main

‎.github/workflows/release-nightly.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,12 @@ jobs:
4646
run: 'npm ci'
4747

4848
- name: 'Run Tests'
49-
<<<<<<< HEAD
5049
uses: './.github/actions/run-tests'
5150
with:
5251
force_skip_tests: '${{ github.event.inputs.force_skip_tests }}'
53-
=======
5452
if: "${{github.event.inputs.force_skip_tests != 'true'}}"
5553
uses: './.github/actions/run-tests'
5654
with:
57-
>>>>>>> upstream/main
5855
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
5956

6057
- name: 'Get Nightly Version'

‎.github/workflows/release-patch-3-release.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,12 @@ jobs:
144144
echo " Previous Tag: ${{ steps.patch_version.outputs.PREVIOUS_TAG }}"
145145
146146
- name: 'Run Tests'
147-
<<<<<<< HEAD
148147
uses: './.github/actions/run-tests'
149148
with:
150149
force_skip_tests: '${{ github.event.inputs.force_skip_tests }}'
151-
=======
152150
if: "${{github.event.inputs.force_skip_tests != 'true'}}"
153151
uses: './.github/actions/run-tests'
154152
with:
155-
>>>>>>> upstream/main
156153
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
157154
working-directory: './release'
158155

‎.github/workflows/release-promote.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,12 @@ jobs:
141141
run: 'npm ci'
142142

143143
- name: 'Run Tests'
144-
<<<<<<< HEAD
145144
uses: './.github/actions/run-tests'
146145
with:
147146
force_skip_tests: '${{ github.event.inputs.force_skip_tests }}'
148-
=======
149147
if: "${{github.event.inputs.force_skip_tests != 'true'}}"
150148
uses: './.github/actions/run-tests'
151149
with:
152-
>>>>>>> upstream/main
153150
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
154151
working-directory: './release'
155152

‎docs/headless.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,8 @@ Key command-line options for headless usage:
244244
| `--yolo`, `-y` | Auto-approve all actions | `gemini -p "query" --yolo` |
245245
| `--approval-mode` | Set approval mode | `gemini -p "query" --approval-mode auto_edit` |
246246

247-
<<<<<<< HEAD
248247
For complete details on all available configuration options, settings files, and environment variables, see the [Configuration Guide](./configuration.md).
249-
=======
250248
For complete details on all available configuration options, settings files, and environment variables, see the [Configuration Guide](./cli/configuration.md).
251-
>>>>>>> upstream/main
252249

253250
## Examples
254251

@@ -321,14 +318,11 @@ tail -5 usage.log
321318

322319
## Resources
323320

324-
<<<<<<< HEAD
325321
- [CLI Configuration](./configuration.md) - Complete configuration guide
326322
- [Authentication](./authentication.md) - Setup authentication
327323
- [Commands](./commands.md) - Interactive commands reference
328324
- [Tutorials](./tutorials.md) - Step-by-step automation guides
329-
=======
330325
- [CLI Configuration](./cli/configuration.md) - Complete configuration guide
331326
- [Authentication](./cli/authentication.md) - Setup authentication
332327
- [Commands](./cli/commands.md) - Interactive commands reference
333328
- [Tutorials](./cli/tutorials.md) - Step-by-step automation guides
334-
>>>>>>> upstream/main

0 commit comments

Comments
 (0)