Merge updated and tested action

Signed-off-by: Aaron Wislang <aaron.wislang@microsoft.com>

Author: asw101

.github/workflows/publish.yml

@@ -20,6 +20,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Cache cargo bin
       id: cache-cargo
       uses: actions/cache@v3
@@ -42,6 +49,4 @@ jobs:
       run: bash scripts/build.sh
 
     - name: Run publish script
-      env:
-        GH_TOKEN: ${{ github.token }}
       run: bash scripts/publish.sh

.github/workflows/test.yml

@@ -1,19 +1,16 @@
 #!/bin/bash
 
-# login to the registry
-# if running locally, we may need to: 
-# gh auth refresh -h github.com -s write:packages,read:packages
-gh auth token | docker login ghcr.io --username YOURUSERNAME --password-stdin
-
-# publish using wkg
-PROJECT_NAME="rust_wasi_hello"
-
-if [ -z "$IMAGE_NAME" ]; then
-  GH_USER=$(gh api user --jq '.login')
-  IMAGE_NAME="${GH_USER}/rust-wasi-hello"
-  export IMAGE_NAME
+# not running in github actions? use gh cli to login, etc, locally
+if [ "$GITHUB_ACTIONS" != "true" ]; then
+    # login to the registry
+    # if running locally, we may need to: 
+    # gh auth refresh -h github.com -s write:packages,read:packages
+    gh auth token | docker login ghcr.io --username YOURUSERNAME --password-stdin
+    GH_USER=$(gh api user --jq '.login')
+    IMAGE_NAME="${GH_USER}/rust-wasi-hello"
 fi
 
+PROJECT_NAME="rust_wasi_hello"
 REGISTRY_REFERENCE="ghcr.io/${IMAGE_NAME}:latest"
 
 wkg oci push $REGISTRY_REFERENCE target/wasm32-wasip1/release/$PROJECT_NAME.wasm