diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edcb2b77..b3e1550c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,6 +218,9 @@ jobs: with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"} - name: Deploy run: dart pub run grinder update-bazel + env: + GH_TOKEN: "${{ secrets.GH_TOKEN }}" + GH_USER: sassbot deploy_pub: name: "Deploy Pub" @@ -255,7 +258,7 @@ jobs: name: "Deploy Chocolatey" runs-on: windows-latest needs: [sanity_checks] - if: "startsWith('refs/tags/', github.ref) && github.repository == 'sass/dart-sass'" + if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'" steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c94b75e..aff79767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.32.4 + +* No user-visible changes. + ## 1.32.3 * Optimize `==` for numbers that have different units. diff --git a/pubspec.yaml b/pubspec.yaml index bd85281a..e9d024f4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.32.3 +version: 1.32.4 description: A Sass implementation in Dart. author: Sass Team homepage: https://github.com/sass/dart-sass diff --git a/tool/grind/bazel.dart b/tool/grind/bazel.dart index be95b1d6..b73d7c67 100644 --- a/tool/grind/bazel.dart +++ b/tool/grind/bazel.dart @@ -24,7 +24,15 @@ Future updateBazel() async { .readAsStringSync() .replaceFirst(RegExp(r'"sass": "[^"]+"'), '"sass": "${pkg.version}"')); - run("yarn", workingDirectory: p.join(repo, "sass")); + try { + run("yarn", workingDirectory: p.join(repo, "sass")); + } on ProcessException catch (error) { + if (error.stderr.contains("Couldn't find any versions for \"sass\"")) { + log("The new sass version doesn't seem to be available yet, waiting 10s..."); + await Future.delayed(Duration(seconds: 10)); + run("yarn", workingDirectory: p.join(repo, "sass")); + } + } run("git", arguments: [ @@ -41,8 +49,8 @@ Future updateBazel() async { workingDirectory: repo, runOptions: sassBotEnvironment); - var username = environment('GITHUB_USER'); - var password = environment('GITHUB_TOKEN'); + var username = environment('GH_USER'); + var password = environment('GH_TOKEN'); await runAsync("git", arguments: [ "push",