Skip to content

Commit

Permalink
Merge branch 'master' into st/feat/add-headers-for-optimistic-concurr…
Browse files Browse the repository at this point in the history
…ency-control
  • Loading branch information
Torres-ssf committed Feb 12, 2025
2 parents f39e124 + 75d7f39 commit d80fbd7
Show file tree
Hide file tree
Showing 731 changed files with 14,611 additions and 14,187 deletions.
4 changes: 4 additions & 0 deletions .changeset/angry-pianos-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
---

chore: migrate `pr` + `next` package publishing to GitHub Packages
5 changes: 5 additions & 0 deletions .changeset/curly-brooms-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuel-ts/account": patch
---

chore: merge gas price and predicate estimation requests
6 changes: 6 additions & 0 deletions .changeset/curvy-peaches-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"create-fuels": patch
"@fuel-ts/utils": patch
---

chore: upgrade `vite` related dependencies
4 changes: 4 additions & 0 deletions .changeset/empty-pigs-talk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
---

chore: `@fuel-ts/recipes` now correctly bumped on release
13 changes: 13 additions & 0 deletions .changeset/healthy-mayflies-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"create-fuels": patch
"@fuel-ts/abi-coder": patch
"@fuel-ts/account": patch
"@fuel-ts/address": patch
"@fuel-ts/crypto": patch
"@fuel-ts/hasher": patch
"@fuel-ts/logger": patch
"fuels": patch
"@fuel-ts/utils": patch
---

chore: upgrade NPM package versions
4 changes: 4 additions & 0 deletions .changeset/khaki-hairs-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
---

docs: segregate api docs url/deployment
5 changes: 5 additions & 0 deletions .changeset/rotten-pillows-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuel-ts/account": patch
---

feat: add receipts with the operations summary
5 changes: 5 additions & 0 deletions .changeset/serious-pens-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"fuels": patch
---

fix: improve `fuels init` directory detection
5 changes: 5 additions & 0 deletions .changeset/silent-points-punch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuel-ts/account": patch
---

fix: ignored subscriptions not being read
7 changes: 7 additions & 0 deletions .changeset/six-humans-compete.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@fuel-ts/abi-typegen": patch
"fuels": patch
"@fuel-ts/recipes": patch
---

fix: favour `.ts` over `.d.ts` files in `@fuel-ts/abi-typegen`
7 changes: 7 additions & 0 deletions .changeset/tasty-comics-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@internal/forc": patch
"create-fuels": patch
"@fuel-ts/versions": patch
---

chore: upgrade `forc` to `0.66.7`
7 changes: 6 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
DEVNET_WALLET_PVT_KEY=
TESTNET_WALLET_PVT_KEY=
PUBLISHED_NPM_TAG=
PUBLISHED_NPM_TAG=
NETWORK_TEST_URL=
NETWORK_TEST_PVT_KEY=
PERFORMANCE_ANALYSIS_TEST_URL=
PERFORMANCE_ANALYSIS_PVT_KEY=
PERFORMANCE_ANALYSIS_CONTRACT_ADDRESS=
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apps/docs/src/**/*.test.ts
packages/recipes/src
packages/fuels/test/fixtures/project
packages/account/src/providers/__generated__
packages/account/src/providers/assets
packages/account/src/assets

out
CHANGELOG.md
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @digorithm @arboleya @Torres-ssf @Dhaiwat10 @danielbate @nedsalk @petertonysmith94 @maschad
* @digorithm @arboleya @Torres-ssf @danielbate @nedsalk @petertonysmith94
5 changes: 4 additions & 1 deletion .github/actions/ci-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ inputs:
pnpm-version:
description: "PNPM version"
default: 9.4.0
registry-url:
description: "Registry URL"
default: "https://registry.npmjs.org"
runs:
using: "composite"
steps:
Expand All @@ -19,7 +22,7 @@ runs:
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
registry-url: "https://registry.npmjs.org"
registry-url: ${{ inputs.registry-url }}

- name: Setup PNPM
uses: pnpm/action-setup@v4
Expand Down
41 changes: 0 additions & 41 deletions .github/actions/pr-release/action.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/audit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: "Audit"

on:
pull_request:
branches:
- master

jobs:
audit:
if: false
# if: startsWith(github.head_ref, 'changeset-release')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: CI Setup
uses: ./.github/actions/ci-setup

- name: Audit
run: pnpm audit
1 change: 1 addition & 0 deletions .github/workflows/code-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
lint:
runs-on: ubuntu-latest
name: Lint
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/linear-pr-integration.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pr-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
feat
fix
chore
test
build
docs
ci
rc
- name: Check PR title length
env:
Expand Down
52 changes: 42 additions & 10 deletions .github/workflows/pr-release.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Release to @pr-<number> tag on npm
name: Release to @pr-<number> tag on GitHub Packages
on:
pull_request:
workflow_dispatch:

jobs:
release-pr:
name: "Release PR to npm"
name: "Release PR to GitHub Packages"
runs-on: ubuntu-latest
# comment out if:false to enable release PR to npm
# comment out if:false to enable release PR to GitHub Packages
if: false
permissions: write-all
steps:
Expand All @@ -20,20 +20,52 @@ jobs:
- name: CI Setup
uses: ./.github/actions/ci-setup

- name: Create .npmrc
run: |
cat << EOF > "$HOME/.npmrc"
//npm.pkg.github.com/:_authToken=$GITHUB_TOKEN
@FuelLabs:registry=https://npm.pkg.github.com
EOF
env:
HOME: ${{ github.workspace }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Build
run: pnpm build

- name: Publish to NPM
- name: Release to @pr-${{ github.event.pull_REQUEST.NUMBER }} tag on GitHub Packages
id: release
uses: ./.github/actions/pr-release
with:
npm-token: ${{ secrets.NPM_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
pr-number: ${{ github.event.pull_request.number }}
shell: bash
run: |
pnpm changeset:next
pnpm changeset version --snapshot pr-${{ github.event.pull_REQUEST.NUMBER }}
changetsets=$(pnpm changeset publish --tag pr-${{ github.event.pull_REQUEST.NUMBER }})
published_version=$(echo "$changetsets" | grep -oP '@\K([0-9]+\.){2}[0-9]+-pr-${{ github.event.pull_REQUEST.NUMBER }}-\d+' | head -1)
echo "published_version=$published_version" >> $GITHUB_OUTPUT
env:
NPM_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HOME: ${{ github.workspace }}
npm_config_registry: "https://npm.pkg.github.com"

- uses: mshick/add-pr-comment@v2
with:
message: |
This PR is published in NPM with version **${{ steps.release.outputs.published_version }}**
This PR is published in GitHub Packages with version **${{ steps.release.outputs.published_version }}**
Install using the following command:
```bash
pnpm add @fuellabs/fuels@${{ steps.release.outputs.published_version }}
```
Or update your package.json:
```json
"dependencies": {
"@fuellabs/fuels": "${{ steps.release.outputs.published_version }}"
}
```
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7 changes: 2 additions & 5 deletions .github/workflows/pr-validate-changesets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ jobs:
with:
fetch-depth: 0
ref: ${{ github.event.client_payload.ref }}
# workaround to ensure changeset file is pushed with REPO_TOKEN owner's account
# see https://github.com/changesets/action/issues/70
persist-credentials: false

- name: Get PR's changeset file
run: |
Expand Down Expand Up @@ -51,7 +48,7 @@ jobs:
run: |
echo "machine github.com" > $HOME/.netrc
echo "login github-actions[bot]" >> $HOME/.netrc
echo "password ${{ secrets.REPO_TOKEN }}" >> $HOME/.netrc
echo "password ${{ secrets.GITHUB_TOKEN }}" >> $HOME/.netrc
chmod 600 $HOME/.netrc
- name: Commit Changeset
Expand All @@ -63,7 +60,7 @@ jobs:
git commit -m "build: update dependency changeset"
git push origin HEAD:${{ github.event.pull_request.head.ref }}
env:
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

validate-changeset:
name: Validate PR Changeset
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/release-deprecate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ on:
type: boolean
description: Deprecate versions? Otherwise dry-run mode will be used.
default: false
filter_by_package_name:
type: string
description: Filter by package name
default: ""
filter_by_package_version:
type: string
description: Filter by package version
default: ""
chunk_size:
type: number
description: Chunk size
default: 1000

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -16,14 +28,23 @@ jobs:
deprecate-npm-versions:
name: Deprecate versions next, pr and rc
runs-on: buildjet-4vcpu-ubuntu-2204
environment: npm-deploy
steps:
- name: Checkout
uses: actions/checkout@v4

- name: CI Setup
uses: ./.github/actions/ci-setup

- name: Setup NPM registry
uses: FuelLabs/github-actions/setups/npm@master
with:
npm-token: ${{ secrets.NPM_DEPLOY_TOKEN }}

- name: Deprecate
run: pnpm release:deprecate
env:
DEPRECATE_VERSIONS: ${{ github.event.inputs.deprecate_versions }}
FILTER_BY_PACKAGE_NAME: ${{ github.event.inputs.filter_by_package_name }}
FILTER_BY_VERSION: ${{ github.event.inputs.filter_by_package_version }}
CHUNK_SIZE: ${{ github.event.inputs.chunk_size }}
Loading

0 comments on commit d80fbd7

Please sign in to comment.