Test Bazel 7 (#2504)

brentleyjones · web-flow · commit a914ae877f15 · 2023-08-25T23:12:03.000Z
diff --git a/buildbuddy.yaml b/buildbuddy.yaml
@@ -16,6 +16,12 @@ x_templates:
       env:
         USE_BAZEL_VERSION: 5.4.1
 
+    - &bazel_7
+      env:
+        # Versions past this require a new rules_apple, but one hasn't been
+        # released yet
+        USE_BAZEL_VERSION: 7.0.0-pre.20230724.1
+
     - &normal_resources
       resource_requests: { memory: 6GB }
     - &light_resources
@@ -97,6 +103,14 @@ actions:
     <<: *root_workspace
     bazel_commands:
       - *test_all
+  - name: Test - Bazel 7
+    <<: *bazel_7
+    <<: *arm64
+    <<: *normal_resources
+    <<: *action_base
+    <<: *root_workspace
+    bazel_commands:
+      - *test_all
 
   - name: Integration Test - Root
     <<: *arm64
@@ -154,6 +168,14 @@ actions:
     bazel_commands:
       - *generate_integration
       - *build_all
+  - name: Integration Test - "examples/integration" - Bazel 7
+    <<: *bazel_7
+    <<: *action_base
+    <<: *normal_resources
+    <<: *examples_integration_workspace
+    bazel_commands:
+      - *validate_integration
+      - *build_all
 
   - name: Integration Test - "examples/sanitizers"
     <<: *arm64
@@ -173,6 +195,16 @@ actions:
       - *validate_integration
       - *build_all
 
+  ## Uncomment when rules_ios performs ObjcProvider -> CcInfo linking migration
+  # - name: Integration Test - "examples/rules_ios" - Bazel 7
+  #   <<: *bazel_7
+  #   <<: *action_base
+  #   <<: *normal_resources
+  #   <<: *examples_rules_ios_workspace
+  #   bazel_commands:
+  #     - *validate_integration
+  #     - *build_all
+
   - name: Validate release.tar.gz
     <<: *arm64
     <<: *normal_resources
diff --git a/examples/cc/test/fixtures/bazel-7/bwb_replacements.txt b/examples/cc/test/fixtures/bazel-7/bwb_replacements.txt
@@ -0,0 +1,2 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-5cdabfca8eac
+darwin_x86_64-dbg-STABLE-1 darwin_x86_64-dbg-ST-0e23bf88498f
diff --git a/examples/cc/test/fixtures/bazel-7/bwx_replacements.txt b/examples/cc/test/fixtures/bazel-7/bwx_replacements.txt
@@ -0,0 +1,2 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-5cdabfca8eac
+darwin_x86_64-dbg-STABLE-1 darwin_x86_64-dbg-ST-0e23bf88498f
diff --git a/examples/integration/test/fixtures/bazel-7/bwb_replacements.txt b/examples/integration/test/fixtures/bazel-7/bwb_replacements.txt
@@ -0,0 +1,47 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-95d00f9ba2bf
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-6d466c728250
+watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-STABLE-2 watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-611b8ce0efd6
+tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-STABLE-3 tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-06e8c1618491
+ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-STABLE-4 ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-95c3cc8ad2fd
+watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-STABLE-5 watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-74f6391bc444
+tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-STABLE-6 tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-7a375d656b47
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-opt-STABLE-7 ios-x86_64-min15.0-applebin_ios-ios_x86_64-opt-ST-0046c3b86626
+watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-opt-STABLE-8 watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-opt-ST-b013746bccbe
+tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-opt-STABLE-9 tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-opt-ST-aef451a27c30
+ios-arm64-min15.0-applebin_ios-ios_arm64-opt-STABLE-10 ios-arm64-min15.0-applebin_ios-ios_arm64-opt-ST-7d45451898ce
+watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-opt-STABLE-11 watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-opt-ST-8de1d3b11bc3
+tvos-arm64-min15.0-applebin_tvos-tvos_arm64-opt-STABLE-12 tvos-arm64-min15.0-applebin_tvos-tvos_arm64-opt-ST-68330ff85b52
+applebin_ios-ios_x86_64-dbg-STABLE-13 applebin_ios-ios_x86_64-dbg-ST-757eddd72424
+applebin_ios-ios_arm64-dbg-STABLE-14 applebin_ios-ios_arm64-dbg-ST-588cb709d547
+applebin_ios-ios_x86_64-opt-STABLE-15 applebin_ios-ios_x86_64-opt-ST-043c362894a9
+applebin_ios-ios_arm64-opt-STABLE-16 applebin_ios-ios_arm64-opt-ST-2d7a5317cc4d
+applebin_watchos-watchos_x86_64-dbg-STABLE-17 applebin_watchos-watchos_x86_64-dbg-ST-9c86f0d7e216
+applebin_watchos-watchos_arm64_32-dbg-STABLE-18 applebin_watchos-watchos_arm64_32-dbg-ST-8a85d9b7b31e
+applebin_watchos-watchos_x86_64-opt-STABLE-19 applebin_watchos-watchos_x86_64-opt-ST-13a4012780c9
+applebin_watchos-watchos_arm64_32-opt-STABLE-20 applebin_watchos-watchos_arm64_32-opt-ST-c460ba8a6d69
+applebin_watchos-watchos_x86_64-dbg-STABLE-21 applebin_watchos-watchos_x86_64-dbg-ST-f35139468db0
+applebin_watchos-watchos_arm64_32-dbg-STABLE-22 applebin_watchos-watchos_arm64_32-dbg-ST-a26dffe52ee6
+applebin_watchos-watchos_x86_64-opt-STABLE-23 applebin_watchos-watchos_x86_64-opt-ST-d39af3e914a0
+applebin_watchos-watchos_arm64_32-opt-STABLE-24 applebin_watchos-watchos_arm64_32-opt-ST-8b91f1bb17b2
+applebin_tvos-tvos_x86_64-dbg-STABLE-25 applebin_tvos-tvos_x86_64-dbg-ST-29113c2810ec
+applebin_tvos-tvos_arm64-dbg-STABLE-26 applebin_tvos-tvos_arm64-dbg-ST-f69f68f222be
+applebin_tvos-tvos_x86_64-opt-STABLE-27 applebin_tvos-tvos_x86_64-opt-ST-ab2d1b568cc6
+applebin_tvos-tvos_arm64-opt-STABLE-28 applebin_tvos-tvos_arm64-opt-ST-20c287df39cb
+macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-STABLE-29 macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-ecc8d89b8be3
+macos-x86_64-min12.0-applebin_macos-darwin_x86_64-opt-STABLE-30 macos-x86_64-min12.0-applebin_macos-darwin_x86_64-opt-ST-5ef7bf25a662
+applebin_macos-darwin_x86_64-dbg-STABLE-31 applebin_macos-darwin_x86_64-dbg-ST-dc76f3c34a6a
+applebin_macos-darwin_x86_64-opt-STABLE-32 applebin_macos-darwin_x86_64-opt-ST-741d16fba63e
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-STABLE-33 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-4c1813775f40
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-STABLE-34 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-ST-ab4953d24e69
+applebin_macos-darwin_x86_64-dbg-STABLE-35 applebin_macos-darwin_x86_64-dbg-ST-45c26d039392
+applebin_macos-darwin_x86_64-opt-STABLE-36 applebin_macos-darwin_x86_64-opt-ST-ec36341fb45b
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-STABLE-37 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-ce54935ec0b6
+macos-arm64-min11.0-applebin_macos-darwin_arm64-dbg-STABLE-38 macos-arm64-min11.0-applebin_macos-darwin_arm64-dbg-ST-ad93773caad1
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-STABLE-39 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-d69ead4647af
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-STABLE-40 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-ST-48620d7257c3
+macos-arm64-min11.0-applebin_macos-darwin_arm64-opt-STABLE-41 macos-arm64-min11.0-applebin_macos-darwin_arm64-opt-ST-63fc76da6715
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-STABLE-42 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-ST-8716b62fe5e0
+applebin_macos-darwin_x86_64-dbg-STABLE-43 applebin_macos-darwin_x86_64-dbg-ST-0d7ee43eec2c
+applebin_macos-darwin_x86_64-opt-STABLE-44 applebin_macos-darwin_x86_64-opt-ST-46eac9152fc4
+darwin_x86_64-dbg-STABLE-45 darwin_x86_64-dbg-ST-0456383a9b1d
+darwin_x86_64-opt-STABLE-46 darwin_x86_64-opt-ST-f521f8c02af8
diff --git a/examples/integration/test/fixtures/bazel-7/bwx_replacements.txt b/examples/integration/test/fixtures/bazel-7/bwx_replacements.txt
@@ -0,0 +1,47 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-95d00f9ba2bf
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-6d466c728250
+watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-STABLE-2 watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-dbg-ST-611b8ce0efd6
+tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-STABLE-3 tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-dbg-ST-06e8c1618491
+ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-STABLE-4 ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-95c3cc8ad2fd
+watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-STABLE-5 watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-dbg-ST-74f6391bc444
+tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-STABLE-6 tvos-arm64-min15.0-applebin_tvos-tvos_arm64-dbg-ST-7a375d656b47
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-opt-STABLE-7 ios-x86_64-min15.0-applebin_ios-ios_x86_64-opt-ST-0046c3b86626
+watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-opt-STABLE-8 watchos-x86_64-min7.0-applebin_watchos-watchos_x86_64-opt-ST-b013746bccbe
+tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-opt-STABLE-9 tvos-x86_64-min15.0-applebin_tvos-tvos_x86_64-opt-ST-aef451a27c30
+ios-arm64-min15.0-applebin_ios-ios_arm64-opt-STABLE-10 ios-arm64-min15.0-applebin_ios-ios_arm64-opt-ST-7d45451898ce
+watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-opt-STABLE-11 watchos-arm64_32-min7.0-applebin_watchos-watchos_arm64_32-opt-ST-8de1d3b11bc3
+tvos-arm64-min15.0-applebin_tvos-tvos_arm64-opt-STABLE-12 tvos-arm64-min15.0-applebin_tvos-tvos_arm64-opt-ST-68330ff85b52
+applebin_ios-ios_x86_64-dbg-STABLE-13 applebin_ios-ios_x86_64-dbg-ST-757eddd72424
+applebin_ios-ios_arm64-dbg-STABLE-14 applebin_ios-ios_arm64-dbg-ST-588cb709d547
+applebin_ios-ios_x86_64-opt-STABLE-15 applebin_ios-ios_x86_64-opt-ST-043c362894a9
+applebin_ios-ios_arm64-opt-STABLE-16 applebin_ios-ios_arm64-opt-ST-2d7a5317cc4d
+applebin_watchos-watchos_x86_64-dbg-STABLE-17 applebin_watchos-watchos_x86_64-dbg-ST-9c86f0d7e216
+applebin_watchos-watchos_arm64_32-dbg-STABLE-18 applebin_watchos-watchos_arm64_32-dbg-ST-8a85d9b7b31e
+applebin_watchos-watchos_x86_64-opt-STABLE-19 applebin_watchos-watchos_x86_64-opt-ST-13a4012780c9
+applebin_watchos-watchos_arm64_32-opt-STABLE-20 applebin_watchos-watchos_arm64_32-opt-ST-c460ba8a6d69
+applebin_watchos-watchos_x86_64-dbg-STABLE-21 applebin_watchos-watchos_x86_64-dbg-ST-f35139468db0
+applebin_watchos-watchos_arm64_32-dbg-STABLE-22 applebin_watchos-watchos_arm64_32-dbg-ST-a26dffe52ee6
+applebin_watchos-watchos_x86_64-opt-STABLE-23 applebin_watchos-watchos_x86_64-opt-ST-d39af3e914a0
+applebin_watchos-watchos_arm64_32-opt-STABLE-24 applebin_watchos-watchos_arm64_32-opt-ST-8b91f1bb17b2
+applebin_tvos-tvos_x86_64-dbg-STABLE-25 applebin_tvos-tvos_x86_64-dbg-ST-29113c2810ec
+applebin_tvos-tvos_arm64-dbg-STABLE-26 applebin_tvos-tvos_arm64-dbg-ST-f69f68f222be
+applebin_tvos-tvos_x86_64-opt-STABLE-27 applebin_tvos-tvos_x86_64-opt-ST-ab2d1b568cc6
+applebin_tvos-tvos_arm64-opt-STABLE-28 applebin_tvos-tvos_arm64-opt-ST-20c287df39cb
+macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-STABLE-29 macos-x86_64-min12.0-applebin_macos-darwin_x86_64-dbg-ST-ecc8d89b8be3
+macos-x86_64-min12.0-applebin_macos-darwin_x86_64-opt-STABLE-30 macos-x86_64-min12.0-applebin_macos-darwin_x86_64-opt-ST-5ef7bf25a662
+applebin_macos-darwin_x86_64-dbg-STABLE-31 applebin_macos-darwin_x86_64-dbg-ST-dc76f3c34a6a
+applebin_macos-darwin_x86_64-opt-STABLE-32 applebin_macos-darwin_x86_64-opt-ST-741d16fba63e
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-STABLE-33 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-4c1813775f40
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-STABLE-34 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-ST-ab4953d24e69
+applebin_macos-darwin_x86_64-dbg-STABLE-35 applebin_macos-darwin_x86_64-dbg-ST-45c26d039392
+applebin_macos-darwin_x86_64-opt-STABLE-36 applebin_macos-darwin_x86_64-opt-ST-ec36341fb45b
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-STABLE-37 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-ce54935ec0b6
+macos-arm64-min11.0-applebin_macos-darwin_arm64-dbg-STABLE-38 macos-arm64-min11.0-applebin_macos-darwin_arm64-dbg-ST-ad93773caad1
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-STABLE-39 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-dbg-ST-d69ead4647af
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-STABLE-40 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-ST-48620d7257c3
+macos-arm64-min11.0-applebin_macos-darwin_arm64-opt-STABLE-41 macos-arm64-min11.0-applebin_macos-darwin_arm64-opt-ST-63fc76da6715
+macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-STABLE-42 macos-x86_64-min11.0-applebin_macos-darwin_x86_64-opt-ST-8716b62fe5e0
+applebin_macos-darwin_x86_64-dbg-STABLE-43 applebin_macos-darwin_x86_64-dbg-ST-0d7ee43eec2c
+applebin_macos-darwin_x86_64-opt-STABLE-44 applebin_macos-darwin_x86_64-opt-ST-46eac9152fc4
+darwin_x86_64-dbg-STABLE-45 darwin_x86_64-dbg-ST-0456383a9b1d
+darwin_x86_64-opt-STABLE-46 darwin_x86_64-opt-ST-f521f8c02af8
diff --git a/examples/rules_ios/test/fixtures/bazel-7/bwb_replacements.txt b/examples/rules_ios/test/fixtures/bazel-7/bwb_replacements.txt
@@ -0,0 +1,5 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-50ee0f59dfee
+ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-STABLE-2 ios-arm64-min15.0-applebin_ios-ios_arm64-dbg-ST-73a919da921b
+applebin_ios-ios_x86_64-dbg-STABLE-3 applebin_ios-ios_x86_64-dbg-ST-8e1beef5c589
+applebin_ios-ios_arm64-dbg-STABLE-4 applebin_ios-ios_arm64-dbg-ST-1a4b65bc4514
diff --git a/examples/sanitizers/test/fixtures/bazel-7/bwb_replacements.txt b/examples/sanitizers/test/fixtures/bazel-7/bwb_replacements.txt
@@ -0,0 +1,3 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-50ee0f59dfee
+applebin_ios-ios_x86_64-dbg-STABLE-2 applebin_ios-ios_x86_64-dbg-ST-8e1beef5c589
diff --git a/examples/sanitizers/test/fixtures/bazel-7/bwx_replacements.txt b/examples/sanitizers/test/fixtures/bazel-7/bwx_replacements.txt
@@ -0,0 +1,3 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
+ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-50ee0f59dfee
+applebin_ios-ios_x86_64-dbg-STABLE-2 applebin_ios-ios_x86_64-dbg-ST-8e1beef5c589
diff --git a/test/fixtures/generator/bazel-7/bwb_replacements.txt b/test/fixtures/generator/bazel-7/bwb_replacements.txt
@@ -0,0 +1,5 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
+macos-x86_64-min13.0-applebin_macos-darwin_x86_64-dbg-STABLE-1 macos-x86_64-min13.0-applebin_macos-darwin_x86_64-dbg-ST-41209c680e4a
+macos-x86_64-min13.0-applebin_macos-darwin_x86_64-opt-STABLE-2 macos-x86_64-min13.0-applebin_macos-darwin_x86_64-opt-ST-f584a9b53b35
+applebin_macos-darwin_x86_64-dbg-STABLE-3 applebin_macos-darwin_x86_64-dbg-ST-f9098740f28a
+applebin_macos-darwin_x86_64-opt-STABLE-4 applebin_macos-darwin_x86_64-opt-ST-fa2cc4e5d2e4
diff --git a/test/fixtures/generator/bazel-7/bwx_replacements.txt b/test/fixtures/generator/bazel-7/bwx_replacements.txt
@@ -0,0 +1,5 @@
+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee
+macos-x86_64-min13.0-applebin_macos-darwin_x86_64-dbg-STABLE-1 macos-x86_64-min13.0-applebin_macos-darwin_x86_64-dbg-ST-41209c680e4a
+macos-x86_64-min13.0-applebin_macos-darwin_x86_64-opt-STABLE-2 macos-x86_64-min13.0-applebin_macos-darwin_x86_64-opt-ST-f584a9b53b35
+applebin_macos-darwin_x86_64-dbg-STABLE-3 applebin_macos-darwin_x86_64-dbg-ST-f9098740f28a
+applebin_macos-darwin_x86_64-opt-STABLE-4 applebin_macos-darwin_x86_64-opt-ST-fa2cc4e5d2e4

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-5cdabfca8eac`
	`2`	`+darwin_x86_64-dbg-STABLE-1 darwin_x86_64-dbg-ST-0e23bf88498f`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+darwin_x86_64-dbg-STABLE-0 darwin_x86_64-dbg-ST-4f3eb708b2ee`
	`2`	`+ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-STABLE-1 ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-50ee0f59dfee`
	`3`	`+applebin_ios-ios_x86_64-dbg-STABLE-2 applebin_ios-ios_x86_64-dbg-ST-8e1beef5c589`