From 1b40f05b8c9ffef9814eb63ebd1e1487ef3bf24d Mon Sep 17 00:00:00 2001
From: Nick Gerleman <ngerlem@meta.com>
Date: Fri, 30 Jun 2023 11:44:15 -0700
Subject: [PATCH] Fixes for publish workflows (#1319)

Summary:
Pull Request resolved: https://github.com/facebook/yoga/pull/1319

This fixes a few issues encountered during publishing Yoga `2.0.0-beta.1`.

1. The tag trigger was missing quotes needed to be valid syntax
2. `pod trunk publish` must be run with `--synchronous` if we are publishing a package that relies on another just published package. There does not seem to be a way to just publish evertything at once.
3. `yarn publish` was not reading the NPM auth token from the environment, so we write it to a `.npmrc` before publishing.
4. The root `.gitignore` was not updated when moving to yarn workspaces to ignore `node_modules`, so the OSS Yoga repo (not internal) will, try to add its contents after `yarn install`.

Reviewed By: cortinico

Differential Revision: D47135994

fbshipit-source-id: d8c9b05176a98443be1ebc7cf74996f22520d20d
---
 .github/workflows/publish-android-release.yml   | 2 +-
 .github/workflows/publish-cocoapods-release.yml | 5 +++--
 .github/workflows/publish-npm-release.yml       | 7 ++++---
 .gitignore                                      | 1 +
 javascript/.gitignore                           | 1 -
 website-next/.gitignore                         | 3 ---
 website/.gitignore                              | 2 --
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/publish-android-release.yml b/.github/workflows/publish-android-release.yml
index fe08069a..d9a252b9 100644
--- a/.github/workflows/publish-android-release.yml
+++ b/.github/workflows/publish-android-release.yml
@@ -3,7 +3,7 @@ name: Publish Android Release
 on:
   push:
     tags:
-      - *
+      - '*'
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/publish-cocoapods-release.yml b/.github/workflows/publish-cocoapods-release.yml
index 9d4e5ef5..8f314852 100644
--- a/.github/workflows/publish-cocoapods-release.yml
+++ b/.github/workflows/publish-cocoapods-release.yml
@@ -3,7 +3,7 @@ name: Publish CocoaPods Release
 on:
   push:
     tags:
-      - *
+      - '*'
   workflow_dispatch:
 
 jobs:
@@ -23,6 +23,7 @@ jobs:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
 
       - name: Publish YogaKit
-        run: pod trunk push YogaKit.podspec
+        # Must run with --synchronous since YogaKit may depend on the just published version of Yoga
+        run: pod trunk push YogaKit.podspec --synchronous
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
diff --git a/.github/workflows/publish-npm-release.yml b/.github/workflows/publish-npm-release.yml
index 851c7656..a558b699 100644
--- a/.github/workflows/publish-npm-release.yml
+++ b/.github/workflows/publish-npm-release.yml
@@ -3,7 +3,7 @@ name: Publish NPM Release
 on:
   push:
     tags:
-      - *
+      - '*'
   workflow_dispatch:
 
 jobs:
@@ -17,8 +17,9 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup-js
 
+      - name: Store auth token in config file
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+
       - name: yarn publish
         run: yarn publish
         working-directory: javascript
-         env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 2eb5dc1a..7d75c154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /.buckd
 /gentest/test.html
 .buck-java11
+node_modules
 
 # Jekyll
 /.sass-cache/
diff --git a/javascript/.gitignore b/javascript/.gitignore
index 198af7f7..54e8f18f 100644
--- a/javascript/.gitignore
+++ b/javascript/.gitignore
@@ -1,4 +1,3 @@
 /binaries
 /build
 /dist
-/node_modules
diff --git a/website-next/.gitignore b/website-next/.gitignore
index b2d6de30..c67e2c8d 100644
--- a/website-next/.gitignore
+++ b/website-next/.gitignore
@@ -1,6 +1,3 @@
-# Dependencies
-/node_modules
-
 # Production
 /build
 
diff --git a/website/.gitignore b/website/.gitignore
index f1cbaee1..e4a5ddf7 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -1,6 +1,4 @@
 # Project dependencies
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
 .cache/
 # Build directory
 public/